挂机帐号

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

@@ -8,24 +8,26 @@ import com.sheep.jiuyan.samllsheep.Config;
 
 public class Url {
     public static String UPLOAD_IMG = Config.instance().mBaseUrl + "/v1/up/";
-    public static String PUBLISH_TASKS =Config.instance().mBaseUrl + "/v1/task_publish/getTasks/";
+    public static String PUBLISH_TASKS = Config.instance().mBaseUrl + "/v1/task_publish/getTasks/";
     public static String BIND_WX = Config.instance().mBaseUrl + "/v1/user/bindWx";
-    public static String BIND_ROBOT=Config.instance().mBaseUrl + "/v1/user/getRobot";
-    public static String USER_INFO=Config.instance().mBaseUrl + "/v1/user/getUserInfo";
-    public static String USER_COMMIT=Config.instance().mBaseUrl + "/v1/user/getDoneTask";
-    public static String USER_CHECK_REGISTER=Config.instance().mBaseUrl + "/v1/task_publish/getRegisterTask";
-    public static String USER_REGISTER_TASK=Config.instance().mBaseUrl + "/v1/task_publish/registerTask";
-    public static String USER_PULL_TASK=Config.instance().mBaseUrl + "/v1/task_publish/getDoingTask";
-    public static String USER_WITHDRAW_RECORD=Config.instance().mBaseUrl + "/v1/withDraw/getHistroyCommit";
-    public static String USER_WITHDRAW=Config.instance().mBaseUrl + "/v1/withDraw/withDraw";
-    public static String WXTASK=Config.instance().mBaseUrl + "/v1/task_publish/getWxTask";
-    public static String MONEYRECORD=Config.instance().mBaseUrl + "/v1/user/getMoneyRecord";
-    public static String GET_TASK_COUNT=Config.instance().mBaseUrl + "/v1/user/getTaskCount";
+    public static String BIND_ROBOT = Config.instance().mBaseUrl + "/v1/user/getRobot";
+    public static String USER_INFO = Config.instance().mBaseUrl + "/v1/user/getUserInfo";
+    public static String USER_COMMIT = Config.instance().mBaseUrl + "/v1/user/getDoneTask";
+    public static String USER_CHECK_REGISTER = Config.instance().mBaseUrl + "/v1/task_publish/getRegisterTask";
+    public static String USER_REGISTER_TASK = Config.instance().mBaseUrl + "/v1/task_publish/registerTask";
+    public static String USER_PULL_TASK = Config.instance().mBaseUrl + "/v1/task_publish/getDoingTask";
+    public static String USER_WITHDRAW_RECORD = Config.instance().mBaseUrl + "/v1/withDraw/getHistroyCommit";
+    public static String USER_WITHDRAW = Config.instance().mBaseUrl + "/v1/withDraw/withDraw";
+    public static String WXTASK = Config.instance().mBaseUrl + "/v1/task_publish/getWxTask";
+    public static String MONEYRECORD = Config.instance().mBaseUrl + "/v1/user/getMoneyRecord";
+    public static String GET_TASK_COUNT = Config.instance().mBaseUrl + "/v1/user/getTaskCount";
 
-    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 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";
+    public static String BINGACCOUNT = Config.instance().mBaseUrl + "/v1/user/register";
+    public static String REQUEST_HOOK = Config.instance().mBaseUrl + "/static/index.html";
+    public static String ADD_CHILD_WX = Config.instance().mBaseUrl + "/static/apply3.html";
 
 }

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

@@ -82,7 +82,7 @@ public class WebActivity extends BaseActivity {
             map.put("wx_1", user);
             map.put("ps_1", pass);
             map.put("phone", phone);
-            NetManager.get(Url.WXACCOUNT, map, WebActivity.this,
+            NetManager.get(Url.COMMIT_WXACCOUNT, map, WebActivity.this,
                     new SheepCallback<String>(WebActivity.this) {
                         @Override
                         public void success(String string) {

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

@@ -1,5 +1,6 @@
 package com.sheep.jiuyan.samllsheep.page;
 
+import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -9,14 +10,14 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 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.AdpChangeUser;
 import com.sheep.jiuyan.samllsheep.page.adapter.AdpWxDetailList;
-import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
-import com.sheep.jiuyan.samllsheep.page.entry.User;
+import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
 import com.sheep.jiuyan.samllsheep.page.entry.WxDetailList;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -26,8 +27,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 
-import okhttp3.Call;
-
 /**
  * @ Created by Dlg
  * @ <p>TiTle:  WxAccountDetail</p>
@@ -38,6 +37,7 @@ import okhttp3.Call;
 public class WxAccountDetail extends BaseActivity {
 
     public final static String INTENT_WXID_STR = "INTENT_WXID_STR";
+    public final static String INTENT_NAME = "DATA";
     private RecyclerView mRecyclerView;//列表
     private TextView mTxtAccount;//当前微信号
     private AdpWxDetailList mAdpWxDetailList;
@@ -71,6 +71,7 @@ public class WxAccountDetail extends BaseActivity {
     }
 
 
+    private List<WXAccount> mWxlist;
     /**
      * 切换用户的实现
      */
@@ -78,29 +79,45 @@ public class WxAccountDetail extends BaseActivity {
         @Override
         public void onClick(View view) {
             if (mPopupWindow == null) {
-                View view1 = View.inflate(WxAccountDetail.this, R.layout.pop_change_user, null);
+                final View view1 = View.inflate(WxAccountDetail.this, R.layout.pop_change_user, null);
                 mPopupWindow = new PopupWindow(view1, G.WIDTH, -2);
                 View foot = View.inflate(WxAccountDetail.this, R.layout.foot_pop_change_user, null);
                 foot.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        G.showToast("点我添加");
+                        Intent intent = new Intent(WxAccountDetail.this, WebActivity.class);
+                        intent.putExtra(WebActivity.INTENT_URL, Url.ADD_CHILD_WX);
+                        intent.putExtra(WebActivity.INTENT_TITLE, "添加微信号");
+                        WxAccountDetail.this.startActivity(intent);
+                        mPopupWindow.dismiss();
                     }
                 });
-                ListView listView = view1.findViewById(R.id.list_pop_change_user);
+                final ListView listView = view1.findViewById(R.id.list_pop_change_user);
                 listView.addFooterView(foot);
-                //测试
-                mAdpChangeUser.add(new User());
-                mAdpChangeUser.add(new User());
-                mAdpChangeUser.add(new User());
-                mAdpChangeUser.add(new User());
-                listView.setAdapter(mAdpChangeUser);
                 mPopupWindow.setContentView(view1);
                 mPopupWindow.setOutsideTouchable(true);
-                listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                HashMap<String, String> map = new HashMap<>();
+                map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
+                NetManager.get(Url.WXACCOUNT, map, SheepApp.mContext, new SheepCallback<List<WXAccount>>(WxAccountDetail.this) {
+                    @Override
+                    public void success(List<WXAccount> wxAccounts) {
+                        mWxlist = wxAccounts;
+                        mAdpChangeUser.addAll(wxAccounts);
+                        //测试
+                        listView.setAdapter(mAdpChangeUser);
+                        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                            @Override
+                            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                                int id = mWxlist.get(i).getId();
+                                refreshWx(id + "");
+                                mPopupWindow.dismiss();
+                            }
+                        });
+                    }
+
                     @Override
-                    public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                        G.showToast("点第：" + i + "项");
+                    public void failure(IOException e) {
+                        super.failure(e);
                     }
                 });
             }
@@ -108,15 +125,16 @@ public class WxAccountDetail extends BaseActivity {
         }
     };
 
-
-    @Override
-    public void initData() {
+    private void refreshWx(String id) {
         HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(this));
-        map.put("wx_id", "39");
+        map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
+        map.put("wx_id", id);
         NetManager.get(Url.TASK_LIST, map, this, new SheepCallback<List<WxDetailList>>(this) {
             @Override
             public void success(List<WxDetailList> tasks) {
+                if (mAdpWxDetailList != null) {
+                    mAdpWxDetailList.clear();
+                }
                 if (tasks != null && tasks.size() > 0) {
                     mAdpWxDetailList.addAll(tasks);
                     mAdpWxDetailList.notifyDataSetChanged();
@@ -126,4 +144,14 @@ public class WxAccountDetail extends BaseActivity {
     }
 
 
+    @Override
+    public void initData() {
+        Intent intent = getIntent();
+        String wxName = intent.getStringExtra(INTENT_NAME);
+        String wxID = intent.getStringExtra(INTENT_WXID_STR);
+        mTxtAccount.setText(wxName);
+        refreshWx(wxID);
+    }
+
+
 }

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

@@ -4,9 +4,11 @@ import android.content.Context;
 import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
+import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
 
 /**
  * @ Created by Dlg
@@ -16,7 +18,7 @@ import com.sheep.jiuyan.samllsheep.page.entry.User;
  * @ QQ:    315096953
  */
 
-public class AdpChangeUser extends AdpCommonList<User> {
+public class AdpChangeUser extends AdpCommonList<WXAccount> {
 
     public AdpChangeUser(Context context) {
         super(context);
@@ -24,9 +26,9 @@ public class AdpChangeUser extends AdpCommonList<User> {
 
     @Override
     public View getView(int i, View view, ViewGroup viewGroup) {
-        if (view == null) {
-            view = View.inflate(mContext, R.layout.item_pop_change_user, null);
-        }
+        view = View.inflate(mContext, R.layout.item_pop_change_user, null);
+        TextView wxID = view.findViewById(R.id.txt_item_pop_change_user_nick);
+        wxID.setText(mListDatas.get(i).getWxId());
         return view;
     }
 

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

@@ -20,6 +20,7 @@ import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
 public class AdpTaskList extends AdpCommonRecy<WXAccount> {
 
     private final static int TAG_WXID = R.id.tagid1;
+    private final static int TAG_WXNAME = R.id.tagid2;
 
     public AdpTaskList(Context context) {
         super(context);
@@ -33,6 +34,7 @@ public class AdpTaskList extends AdpCommonRecy<WXAccount> {
     @Override
     public void convert(ViewHolder holder, WXAccount wxAccount) {
         holder.itemView.setTag(TAG_WXID, wxAccount.getId() + "");
+        holder.itemView.setTag(TAG_WXNAME, wxAccount.getWxId());
         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)
@@ -66,6 +68,7 @@ public class AdpTaskList extends AdpCommonRecy<WXAccount> {
             public void onClick(View view) {
                 Intent intent = new Intent(mContext, WxAccountDetail.class);
                 intent.putExtra(WxAccountDetail.INTENT_WXID_STR, view.getTag(TAG_WXID) + "");
+                intent.putExtra(WxAccountDetail.INTENT_NAME, view.getTag(TAG_WXNAME) + "");
                 mContext.startActivity(intent);
             }
         });

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

@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
@@ -76,7 +77,7 @@ public class FgtMainPageOffline extends BaseFragment {
             @Override
             public void onClick(View view) {
                 Intent intent = new Intent(getActivity(), WebActivity.class);
-                intent.putExtra(WebActivity.INTENT_URL, "http://10.8.210.190:8081");
+                intent.putExtra(WebActivity.INTENT_URL, Url.REQUEST_HOOK);
                 intent.putExtra(WebActivity.INTENT_LOAD_JS, "1");
                 intent.putExtra(WebActivity.INTENT_TITLE, "申请挂机");
                 startActivity(intent);
@@ -97,14 +98,7 @@ public class FgtMainPageOffline extends BaseFragment {
         NetManager.get(Url.WXACCOUNT, map, getActivity(), new SheepCallback<List<WXAccount>>(getActivity()) {
             @Override
             public void success(List<WXAccount> wxAccounts) {
-                if (!isLoadMore) {
-                    //                    mAdpTaskList.clear();//暂时没有分页功能，就这样吧。
-                }
                 mAdpTaskList.clear();
-                mAdpTaskList.add(new WXAccount());
-                mAdpTaskList.add(new WXAccount());
-                mAdpTaskList.add(new WXAccount());
-                mAdpTaskList.add(new WXAccount());
                 if (wxAccounts != null && wxAccounts.size() > 0) {
                     mAdpTaskList.addAll(wxAccounts);
                     mAdpTaskList.notifyDataSetChanged();
@@ -120,11 +114,6 @@ public class FgtMainPageOffline extends BaseFragment {
                 mRecyleViewLoadMoreUtils.setmIsLoading(true);
                 reFreshView();
             }
-
-            @Override
-            public void otherCode(int code, String string) {
-
-            }
         });
     }
 

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

@@ -8,6 +8,7 @@
     android:paddingTop="@dimen/content_padding">
 
     <de.hdodenhof.circleimageview.CircleImageView
+        android:visibility="gone"
         android:id="@+id/img_item_pop_change_user_logo"
         android:layout_width="40dp"
         android:layout_height="40dp"
@@ -20,12 +21,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/content_padding"
-        android:text="昵称"
+        android:text="微信号"
         android:textColor="@color/black_text_deep"
         android:textSize="@dimen/text_size_4"
         app:layout_constraintLeft_toRightOf="@id/img_item_pop_change_user_logo" />
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/txt_item_pop_change_user_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -39,6 +41,7 @@
 
 
     <ImageView
+        android:visibility="gone"
         android:id="@+id/img_item_pop_change_user_choose"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -47,4 +50,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
 </android.support.constraint.ConstraintLayout>

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

@@ -21,6 +21,7 @@
         app:layout_constraintLeft_toRightOf="@id/img_item_wx_account_detail_logo" />
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/txt_item_wx_account_detail_task"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -1,10 +1,10 @@
 <?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"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
-    <include layout="@layout/title" />
+    <include layout="@layout/title"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:text="当前挂机微信账号："
             android:textColor="@color/black_text_deep"
-            android:textSize="@dimen/text_size_5" />
+            android:textSize="@dimen/text_size_5"/>
 
         <TextView
             android:id="@+id/txt_wx_account_detail"
@@ -27,19 +27,19 @@
             android:layout_height="wrap_content"
             android:text="Player"
             android:textColor="@color/colorAccent"
-            android:textSize="@dimen/text_size_4" />
+            android:textSize="@dimen/text_size_4"/>
 
         <Space
             android:layout_width="0dp"
             android:layout_height="1px"
-            android:layout_weight="1" />
+            android:layout_weight="1"/>
 
         <ImageView
             android:id="@+id/img_wx_account_detail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="@dimen/content_padding_small"
-            android:src="@drawable/icon_switch" />
+            android:src="@drawable/icon_switch"/>
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView