Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

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

@@ -113,6 +113,7 @@ public class PlatDailyAdapter extends BaseAdapter {
         }
         viewHolder.WorkDailySummary.setText(pdata.get(position).getWd_comment());
 
+        final ViewHolder finalViewHolder = viewHolder;
         viewHolder.WorkDailyDelete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -129,6 +130,7 @@ public class PlatDailyAdapter extends BaseAdapter {
                                 int mkeyValue = pdata.get(position).getWd_id();
                                 mPosition = position;
                                 doPlatdelete(mCaller, mkeyValue);
+                                finalViewHolder.WorkDailyDelete.setVisibility(View.GONE);
                             }
                         }).show();
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/TaskActivity.java

@@ -31,7 +31,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.iflytek.cloud.speech.RecognizerResult;
 import com.iflytek.cloud.speech.SpeechError;
@@ -101,6 +100,8 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
     private ClearEditText edt_search;
     @ViewInject(R.id.voice_search_iv)
     private ImageView voice_search_iv;
+    private int mCurrentPage = 1;
+    private int mPosition ;
     private Handler handler = new Handler() {
         @SuppressWarnings({"unchecked", "rawtypes"})
         public void handleMessage(Message msg) {
@@ -193,10 +194,14 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
     };
 
     private void doClassifyAllList(List<AllProcess> allList) {
-        if (ListUtils.isEmpty(allList)) return;;
-        if (!ListUtils.isEmpty(waitList)) waitList.clear();
-        if (!ListUtils.isEmpty(doneList)) doneList.clear();
-        if (!ListUtils.isEmpty(isendList)) isendList.clear();
+        if (mCurrentPage == 1) {
+            allList.clear();
+            ToastMessage("刷新成功");
+        } else {
+            ToastMessage("加载完毕");
+        }
+        listview_main.onRefreshComplete();
+        if (ListUtils.isEmpty(allList)) return;
         for (int i = 0; i < allList.size(); i++) {
             // 待处理
             if ((login_Name.equals(allList.get(i).getDealpersoncode()) &&
@@ -260,6 +265,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
         ViewUtils.inject(this);
         // 表示已读
         listview_main = (PullToRefreshListView) findViewById(R.id.listview_schedult);   /**注释：initview */
+        listview_main.setMode(PullToRefreshBase.Mode.BOTH);
         /**注释：自定义view */
         mEmptyLayout = new EmptyLayout(this, listview_main.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
@@ -270,13 +276,14 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
         new Thread(new getallprocess_run()).start();
 //        sendResquestForServer("START", 2);
         initHeaderView();//  头布局显示
-        sendResquestForServerAll(2);  // update TODO :出息进来请求所有任务数据
+        sendResquestForServerAll(2,mCurrentPage);  // update TODO :出息进来请求所有任务数据
         initSearchEvent();
         /**注释：监听 */
         listview_main.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view,
                                     final int position, long id) {
+                mPosition = (int) parent.getItemIdAtPosition(position);
                 NewSchedultAdapter.Store store = (NewSchedultAdapter.Store) view.getTag();
                 store.iv_website.setOnClickListener(new OnClickListener() {
                     @Override
@@ -336,13 +343,30 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
             }
         });
 
-        listview_main.setOnRefreshListener(new OnRefreshListener<ListView>() {
+//        listview_main.setOnRefreshListener(new OnRefreshListener<ListView>() {
+//            @Override
+//            public void onRefresh(PullToRefreshBase<ListView> refreshView) {
+////                refreshing();
+//
+//                listview_main.getLoadingLayoutProxy().setPullLabel("下拉刷新");
+//                sendResquestForServerAll(2,mCurrentPage);
+//            }
+//        });
+
+        listview_main.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
-            public void onRefresh(PullToRefreshBase<ListView> refreshView) {
-//                refreshing();
+            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+                if (!ListUtils.isEmpty(waitList)) waitList.clear();
+                if (!ListUtils.isEmpty(doneList)) doneList.clear();
+                if (!ListUtils.isEmpty(isendList)) isendList.clear();
+                mCurrentPage = 1;
+                sendResquestForServerAll(2, mCurrentPage);
+            }
 
-                listview_main.getLoadingLayoutProxy().setPullLabel("下拉刷新");
-                sendResquestForServerAll(2);
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+                mCurrentPage ++;
+                sendResquestForServerAll(2,mCurrentPage);
             }
         });
     }
@@ -750,7 +774,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
                 state_finish.setSelected(false);
                 state_unconfirmed.setSelected(false);
                 state_all.setSelected(true);
-                sendResquestForServerAll(2);
+                sendResquestForServerAll(2,mCurrentPage);
             }
         });
     }
@@ -784,15 +808,16 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
     /**
      * @注释： 带条件的调转
      */
-    public void sendResquestForServerAll(int handlerWhat) {
+    public void sendResquestForServerAll(int handlerWhat,int mCurrentPage) {
         progressDialog.show();
         String url = Constants.getAppBaseUrl(context) + "common/datalist/data.action";
         Map<String, Object> mparams = new HashMap<String, Object>();
         mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
         mparams.put("caller", "ResourceAssignment");
-        mparams.put("page", "1");
+        mparams.put("page", mCurrentPage);
         mparams.put("pageSize", "100");
         mparams.put("_noc", "1");
+        mparams.put("status", "");
         String em_code = CommonUtil.getSharedPreferences(context, "erp_username");
         mparams.put("condition", "ra_resourcecode='" + em_code + "'" + " and nvl(class,' ')<>'projecttask'");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -859,7 +884,9 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == 0x17 || (requestCode == 0x20 && resultCode == 0x20)) {
-            refreshing();
+//            refreshing();
+            real_List.remove(mPosition);
+            adapter.notifyDataSetChanged();
         }
     }
 }

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

@@ -92,6 +92,8 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     private ClearEditText edt_search;
     @ViewInject(R.id.voice_search_iv)
     private ImageView voice_search_iv;
+    private int mCurrentPage = 1;
+    private int mPosition;
     private Handler handler = new Handler() {
         @SuppressWarnings({"unchecked", "rawtypes"})
         public void handleMessage(Message msg) {
@@ -231,11 +233,15 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     };
 
     private void doClassifyAllList(List<AllProcess> allList) {
+        if (mCurrentPage == 1) {
+            allList.clear();
+            ToastMessage("刷新成功");
+        } else {
+            ToastMessage("加载完毕");
+        }
+        listview_main.onRefreshComplete();
         LogUtil.prinlnLongMsg("login_Name,allList",login_Name + JSON.toJSONString(allList));
         if (ListUtils.isEmpty(allList)) return;
-        if (!ListUtils.isEmpty(waitList)) waitList.clear();
-        if (!ListUtils.isEmpty(doneList)) doneList.clear();
-        if (!ListUtils.isEmpty(isendList)) isendList.clear();
         for (int i = 0; i < allList.size(); i++) {
             // 待处理
             if ((login_Name.equals(allList.get(i).getDealpersoncode()) &&
@@ -278,7 +284,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 if (tab_type == 3){
 //                    adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
 //                    real_List = isendList;
-                    sendServiceForISend();
+                    sendServiceForISend(mCurrentPage);
                     return;
                 }
                 listview_main.setAdapter(adapter);
@@ -304,6 +310,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_TASK);
         listview_main = (PullToRefreshListView) findViewById(R.id.listview_schedult);
+        listview_main.setMode(PullToRefreshBase.Mode.BOTH);
 
         mEmptyLayout = new EmptyLayout(this, listview_main.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
@@ -312,14 +319,15 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         mEmptyLayout.showEmpty();
 //        mEmptyLayout.showLoading();
 
-//        sendResquestForServer("进行中", 2);
-        sendResquestForServer("", 2); // update TODO :出息进来请求所有任务数据
+//        sendResquestForServer("进行中", 2,mCurrentPage);
+        sendResquestForServer("", 2,mCurrentPage); // update TODO :出息进来请求所有任务数据
         initHeaderView();//  头布局显示
         initSearchEvent();
         listview_main.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view,
                                     final int position, long id) {
+                mPosition = (int) parent.getItemIdAtPosition(position);
                 NewSchedultAdapter.Store store = (NewSchedultAdapter.Store) view.getTag();
                 store.iv_website.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -379,16 +387,32 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
             }
         });
 
-        listview_main.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
+//        listview_main.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
+//            @Override
+//            public void onRefresh(PullToRefreshBase<ListView> refreshView) {
+////                refreshing();
+//                listview_main.getLoadingLayoutProxy().setPullLabel("下拉刷新");
+////                if (tab_type == 3){
+////                    sendServiceForISend();
+////                }else {
+//                sendResquestForServer("", 2,mCurrentPage);
+////                }
+//            }
+//        });
+        listview_main.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
-            public void onRefresh(PullToRefreshBase<ListView> refreshView) {
-//                refreshing();
-                listview_main.getLoadingLayoutProxy().setPullLabel("下拉刷新");
-//                if (tab_type == 3){
-//                    sendServiceForISend();
-//                }else {
-                sendResquestForServer("", 2);
-//                }
+            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+                if (!ListUtils.isEmpty(waitList)) waitList.clear();
+                if (!ListUtils.isEmpty(doneList)) doneList.clear();
+                if (!ListUtils.isEmpty(isendList)) isendList.clear();
+                mCurrentPage = 1;
+                sendResquestForServer("", 2,mCurrentPage);
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+                mCurrentPage++;
+                sendResquestForServer("", 2,mCurrentPage);
             }
         });
     }
@@ -420,26 +444,26 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 if (StringUtils.isEmpty(strChche)) return;
 
                 for (int i = 0; i < real_List.size(); i++) {
-                            boolean b = getResult(real_List.get(i).getRecorder() + real_List.get(i).getDealpersoncode()
-                                    + real_List.get(i).getStatus() + real_List.get(i).getTaskname()
-                                    + real_List.get(i).getEndTime() + real_List.get(i).getDatetime(), strChche.trim());
+                    boolean b = getResult(real_List.get(i).getRecorder() + real_List.get(i).getDealpersoncode()
+                            + real_List.get(i).getStatus() + real_List.get(i).getTaskname()
+                            + real_List.get(i).getEndTime() + real_List.get(i).getDatetime(), strChche.trim());
 
-                            if (b){
-                                chche.add(real_List.get(i));
-                            }
-                            if (i == real_List.size() - 1){
-                                adapter = new NewSchedultAdapter(TaskB2BActivity.this, chche);
-                                listview_main.setAdapter(adapter);
-                                if (adapter.getCount() != 0) {
-                                    sendHomeBroadcast(adapter.getCount());
-                                } else {
-                                    mEmptyLayout.showEmpty();
-                                }
-                                listview_main.onRefreshComplete();
-                            }
+                    if (b){
+                        chche.add(real_List.get(i));
+                    }
+                    if (i == real_List.size() - 1){
+                        adapter = new NewSchedultAdapter(TaskB2BActivity.this, chche);
+                        listview_main.setAdapter(adapter);
+                        if (adapter.getCount() != 0) {
+                            sendHomeBroadcast(adapter.getCount());
+                        } else {
+                            mEmptyLayout.showEmpty();
                         }
-                        Log.v("chche",JSON.toJSONString(chche));
+                        listview_main.onRefreshComplete();
                     }
+                }
+                Log.v("chche",JSON.toJSONString(chche));
+            }
         });
     }
     //正则
@@ -473,7 +497,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 || state_unconfirmed == null) {
             mEmptyLayout.showLoading();
             listview_main.getLoadingLayoutProxy().setPullLabel("下拉更新");
-            sendResquestForServer("进行中", 2);
+            sendResquestForServer("进行中", 2,mCurrentPage);
             return;
         }
         if (state_all.isSelected()) {
@@ -482,13 +506,13 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 //            new Thread(new getallprocess_run()).start();
         }
         if (state_finish.isSelected()) {
-            sendResquestForServer("FINISHED", 2);
+            sendResquestForServer("FINISHED", 2,mCurrentPage);
         }
         if (state_start.isSelected()) {
-            sendResquestForServer("进行中", 2);
+            sendResquestForServer("进行中", 2,mCurrentPage);
         }
         if (state_unconfirmed.isSelected()) {
-            sendResquestForServer("UNCONFIRMED", 2);
+            sendResquestForServer("UNCONFIRMED", 2,mCurrentPage);
         }
 
     }
@@ -556,7 +580,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         state_start.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                sendResquestForServer("进行中", 2);
+                sendResquestForServer("进行中", 2,mCurrentPage);
                 popupWindow.dismiss();
                 state_start.setSelected(true);
                 state_finish.setSelected(false);
@@ -569,7 +593,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
             @Override
             public void onClick(View v) {
-                sendResquestForServer("已完成", 2);
+                sendResquestForServer("已完成", 2,mCurrentPage);
                 popupWindow.dismiss();
                 state_start.setSelected(false);
                 state_finish.setSelected(true);
@@ -582,7 +606,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
             @Override
             public void onClick(View v) {
-                sendResquestForServer("待确认", 2);
+                sendResquestForServer("待确认", 2,mCurrentPage);
                 popupWindow.dismiss();
                 state_start.setSelected(false);
                 state_finish.setSelected(false);
@@ -621,7 +645,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                 state_finish.setSelected(false);
                 state_unconfirmed.setSelected(false);
                 state_all.setSelected(true);
-                sendResquestForServer("", 2);
+                sendResquestForServer("", 2,mCurrentPage);
             }
         });
     }
@@ -629,15 +653,14 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     /**
      * @注释：状态码
      */
-    public void sendResquestForServer(String status, int handlerWhat) {
+    public void sendResquestForServer(String status, int handlerWhat,int mCurrentPage) {
         progressDialog.show();
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_list;
         Map<String, Object> params = new HashMap<String, Object>();
-        String statu = "进行中";
         params = new HashMap<>();
         params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "b2b_uu"));
         params.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
-        params.put("pageNumber", "1");
+        params.put("pageNumber", mCurrentPage);
         params.put("pageSize", "100");
         params.put("status", status);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -670,7 +693,8 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == 0x17 || (requestCode == 0x20 && resultCode == 0x20)) {
 //            refreshing();
-            sendResquestForServer("", 2);
+            real_List.remove(mPosition);
+            adapter.notifyDataSetChanged();
         }
     }
 
@@ -701,7 +725,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 //                adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
 //                real_List = isendList;
 
-                sendServiceForISend();
+                sendServiceForISend(mCurrentPage);
                 break;
             case R.id.voice_search_iv:
                 final VoiceToWord voice = new VoiceToWord(TaskB2BActivity.this,"534e3fe2");
@@ -722,16 +746,15 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         listview_main.onRefreshComplete();
     }
 
-    private void sendServiceForISend() {
+    private void sendServiceForISend(int mCurrentPage) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().plat_isend_task;
         Map<String, Object> params = new HashMap<String, Object>();
-        String status="我发起的";
         params=new HashMap<>();
         params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"b2b_uu"));
         params.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
-        params.put("pageNumber", "1");
+        params.put("pageNumber", mCurrentPage);
         params.put("pageSize", "100");
-        params.put("status", status);
+        params.put("status","");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie",  ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(context, url, params, handler, headers, 3, null, null, "get");