flash back fix up

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -126,6 +126,7 @@ public class WorkDailyAdapter extends BaseAdapter {
         }
         viewHolder.WorkDailySummary.setText(mWorkDailyBeanList.get(position).getWD_COMMENT());
 
+        final ViewHolder finalViewHolder = viewHolder;
         viewHolder.WorkDailyDelete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -142,6 +143,7 @@ public class WorkDailyAdapter extends BaseAdapter {
                                     int mkeyValue = mWorkDailyBeanList.get(position).getWD_ID();
                                     mPosition = position;
                                     dodelete(mCaller, mkeyValue);
+                                    finalViewHolder.WorkDailyDelete.setVisibility(View.GONE);
                                 }
                             }).show();
                 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -140,6 +140,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                         }
                         doClassifyAllList(allList); // TODO 分类
                     } else {
+                        sendServiceForISend(mCurrentPage);
                         mEmptyLayout.showEmpty();
                         listview_main.onRefreshComplete();
                     }
@@ -186,28 +187,11 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                             isendList.add(process);
 
                             if (i == data.size() - 1){
-                                adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
-                                listview_main.setAdapter(adapter);
-                                if (adapter.getCount() != 0) {
-                                    sendHomeBroadcast(adapter.getCount());
-                                } else {
-                                    mEmptyLayout.showEmpty();
-                                }
-                                listview_main.onRefreshComplete();
-                                real_List = isendList;
+                                doShowListData();
                             }
                         }
                     }else {
-                        adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
-                        if (adapter == null) return;
-                        listview_main.setAdapter(adapter);
-                        if (adapter.getCount() != 0) {
-                            sendHomeBroadcast(adapter.getCount());
-                        } else {
-                            mEmptyLayout.showEmpty();
-                        }
-                        listview_main.onRefreshComplete();
-                        real_List = isendList;
+                        doShowListData();
                     }
                 }
                 if (msg.what == Constants.APP_SOCKETIMEOUTEXCEPTION) {
@@ -224,6 +208,31 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
     };
 
+    private void doShowListData() {
+        if (tab_type == 1){
+            adapter = new NewSchedultAdapter(TaskB2BActivity.this, waitList);
+            real_List = waitList;
+        }
+
+        if (tab_type == 2){
+            adapter = new NewSchedultAdapter(TaskB2BActivity.this, doneList);
+            real_List = doneList;
+        }
+
+        if (tab_type == 3){
+            adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
+            real_List = isendList;
+            return;
+        }
+        listview_main.setAdapter(adapter);
+        if (adapter.getCount() != 0) {
+            sendHomeBroadcast(adapter.getCount());
+        } else {
+            mEmptyLayout.showEmpty();
+        }
+        listview_main.onRefreshComplete();
+    }
+
     private void doClassifyAllList(List<AllProcess> allList) {
         if (mCurrentPage == 1) {
             if (!ListUtils.isEmpty(real_List)) real_List.clear();
@@ -262,30 +271,9 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
             if (i == allList.size() -1){
                 LogUtil.prinlnLongMsg("waitList",JSON.toJSONString(waitList));
                 LogUtil.prinlnLongMsg("doneList",JSON.toJSONString(doneList));
-                LogUtil.prinlnLongMsg("isendList",JSON.toJSONString(isendList));
-                if (tab_type == 1){
-                    adapter = new NewSchedultAdapter(TaskB2BActivity.this, waitList);
-                    real_List = waitList;
-                }
-
-                if (tab_type == 2){
-                    adapter = new NewSchedultAdapter(TaskB2BActivity.this, doneList);
-                    real_List = doneList;
-                }
+                LogUtil.prinlnLongMsg("isendList", JSON.toJSONString(isendList));
 
-                if (tab_type == 3){
-//                    adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
-//                    real_List = isendList;
-                    sendServiceForISend(mCurrentPage);
-                    return;
-                }
-                listview_main.setAdapter(adapter);
-                if (adapter.getCount() != 0) {
-                    sendHomeBroadcast(adapter.getCount());
-                } else {
-                    mEmptyLayout.showEmpty();
-                }
-                listview_main.onRefreshComplete();
+                sendServiceForISend(mCurrentPage);  //  进来请求我发起的任务数据
             }
         }
 
@@ -312,8 +300,8 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 //        mEmptyLayout.showLoading();
 
 //        sendResquestForServer("进行中", 2,mCurrentPage);
-        sendResquestForServer("", 2,mCurrentPage); // update TODO :出息进来请求所有任务数据
         initHeaderView();//  头布局显示
+        initData();
         initSearchEvent();
         listview_main.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -398,17 +386,23 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 if (!ListUtils.isEmpty(doneList)) doneList.clear();
                 if (!ListUtils.isEmpty(isendList)) isendList.clear();
                 mCurrentPage = 1;
-                sendResquestForServer("", 2,mCurrentPage);
+                initData();
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-                mCurrentPage++;
-                sendResquestForServer("", 2,mCurrentPage);
+               mCurrentPage++;
+               initData();
             }
         });
     }
 
+    private void initData() {
+        progressDialog.show();
+        sendResquestForServer("", 2, mCurrentPage); //  进来请求所有任务数据
+//        sendServiceForISend(mCurrentPage);  //  进来请求我发起的任务数据
+    }
+
     private void initSearchEvent() {
         edt_search.addTextChangedListener(new TextWatcher() {
             @Override
@@ -708,26 +702,21 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 wait_tv.setSelected(true);
                 done_tv.setSelected(false);
                 isend_tv.setSelected(false);
-                adapter = new NewSchedultAdapter(TaskB2BActivity.this, waitList);
-                real_List = waitList;
+                doShowListData();
                 break;
             case R.id.done_tv:
                 tab_type = 2;
                 wait_tv.setSelected(false);
                 done_tv.setSelected(true);
                 isend_tv.setSelected(false);
-                adapter = new NewSchedultAdapter(TaskB2BActivity.this, doneList);
-                real_List = doneList;
+                doShowListData();
                 break;
             case R.id.isend_tv:
                 tab_type = 3;
                 wait_tv.setSelected(false);
                 done_tv.setSelected(false);
                 isend_tv.setSelected(true);
-//                adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
-//                real_List = isendList;
-
-                sendServiceForISend(mCurrentPage);
+                doShowListData();
                 break;
             case R.id.voice_search_iv:
                 final VoiceToWord voice = new VoiceToWord(TaskB2BActivity.this,"534e3fe2");