18:19

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

@@ -383,13 +383,24 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
                         }
                         if (i == real_List.size() - 1){
                             adapter = new NewSchedultAdapter(TaskActivity.this, chche);
+                            listview_main.setAdapter(adapter);
+                            if (adapter.getCount() != 0) {
+                                sendHomeBroadcast(adapter.getCount());
+                            } else {
+                                mEmptyLayout.showEmpty();
+                            }
                             listview_main.onRefreshComplete();
-                            adapter.notifyDataSetChanged();
                         }
                     }
                     Log.v("chche",chche+"");
                 }
 
+                if (!StringUtils.isEmpty(strChche)){
+                    listview_main.getRefreshableView().setAdapter(adapter);
+                }else {
+                    adapter.notifyDataSetInvalidated();
+                }
+
             }
         });
     }
@@ -621,7 +632,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
         String d = null;
         String t = null;
         if (password != null) {
-            d = "" + new Date().getTime();
+            d =  new Date().getTime() + "";
             Blowfish blowfish = new Blowfish("00" + d);
             t = blowfish.encryptString(password);
         }

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

@@ -97,6 +97,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         public void handleMessage(Message msg) {
             try {
                 if (msg.what == 2) {
+                    progressDialog.dismiss();
                     String result = msg.getData().getString("result");
                     JSONObject dataroot = JSON.parseObject(result);
                     JSONArray data = dataroot.getJSONArray("listdata");
@@ -237,7 +238,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
-        mEmptyLayout.showLoading();
+//        mEmptyLayout.showLoading();
        
 //        sendResquestForServer("进行中", 2);
         sendResquestForServer("", 2); // update TODO :出息进来请求所有任务数据
@@ -348,13 +349,23 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                         }
                         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();
-                            adapter.notifyDataSetChanged();
                         }
                     }
                     Log.v("chche",chche+"");
                 }
 
+                if (!StringUtils.isEmpty(strChche)){
+                    listview_main.getRefreshableView().setAdapter(adapter);
+                }else {
+                    adapter.notifyDataSetInvalidated();
+                }
             }
         });
     }
@@ -546,6 +557,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
      * @注释：状态码
      */
     public void sendResquestForServer(String status, int handlerWhat) {
+        progressDialog.show();
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_list;
         Map<String, Object> params = new HashMap<String, Object>();
         String statu="进行中";