bug处理

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

@@ -109,11 +109,6 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                             mAdapter.setData(array);
                             mAdapter.notifyDataSetChanged();
                         }
-
-                        if (currentId != 0) {
-//                            mList.getRefreshableView().setSelection(currentId);
-//                            mList.getRefreshableView().setSelection(0);
-                        }
                         ToastMessage(getString(R.string.common_up_finish));
                         progressDialog.dismiss();
                     } catch (Exception e) {
@@ -175,10 +170,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     if (array.size() == 0) {
                         mEmptyLayout.showEmpty();
                     } else {
-                        handleImids(3, array);
-                    }
-                    if (currentId != 0) {
-//                        mList.getRefreshableView().setSelection(0);
+//                        handleImids(3, array);
                     }
                     ToastMessage(getString(R.string.common_up_finish));
                     progressDialog.dismiss();
@@ -521,6 +513,10 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
     protected void onResume() {
         super.onResume();
 //        mList.setRefreshing(true);
+        if (tab_type == 1){
+            voiceSearchView.setText("");
+            loadProcessToDo(page);
+        }
 
     }
 
@@ -599,6 +595,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     String jp_status = jsonArray.getJSONObject(position).getString("JP_STATUS");
                     String jp_typecode = jsonArray.getJSONObject(position).getString("TYPECODE");
                     String jp_master = jsonArray.getJSONObject(position).getString("CURRENTMASTER");
+                    int tdem_imid = jsonArray.getJSONObject(position).getInteger("EM_IMID");
                     model.name.setText(jp_launchername + "的" + jp_name);
                     if (jp_launchtime != null) {
                         model.date.setText(DateFormatUtil.getStrDate4Date(new Date(jp_launchtime), "MM-dd HH:mm"));
@@ -615,11 +612,11 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     model.imid.setVisibility(View.VISIBLE);
                     model.meimid.setVisibility(View.GONE);
                     //设置显示审批人头像
-                    if (ListUtils.isEmpty(imids)) {
+                    if (tdem_imid != -1) {
+                        AvatarHelper.getInstance().display(tdem_imid+"", model.imid, true, false);//显示圆角图片
+                    } else {
                         String imageUri = "drawable://" + R.drawable.common_header_boy;
                         AvatarHelper.getInstance().display(imageUri, model.imid, true);
-                    } else if (!ListUtils.isEmpty(im_ids)) {
-                        AvatarHelper.getInstance().display(im_ids.get(position), model.imid, true, false);//显示圆角图片
                     }
                     break;
                 case 2:
@@ -633,7 +630,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     if (!StringUtils.isEmpty(jp_name)) jp_name = jp_name.replace("流程", "");
                     String jn_dealtime = jsonArray.getJSONObject(position).getString("JN_DEALTIME");//JP_LAUNCHTIME
                     String jn_dealresult = jsonArray.getJSONObject(position).getString("JN_DEALRESULT");
-
+                    int done_emid = jsonArray.getJSONObject(position).getInteger("EM_IMID");
                     model.name.setText(jn_dealmanname + "的" + jp_name);
                     Long L = TimeUtils.s_str_2_long(jn_dealtime);
                     model.date.setText(DateFormatUtil.getStrDate4Date(new Date(L), "MM-dd HH:mm"));
@@ -668,11 +665,11 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     model.imid.setVisibility(View.VISIBLE);
                     model.meimid.setVisibility(View.GONE);
                     //设置显示审批人头像
-                    if (ListUtils.isEmpty(imids)) {
+                    if (done_emid != -1) {
+                        AvatarHelper.getInstance().display(done_emid+"", model.imid, true, false);//显示圆角图片
+                    } else {
                         String imageUri = "drawable://" + R.drawable.common_header_boy;
                         AvatarHelper.getInstance().display(imageUri, model.imid, true);
-                    } else if (!ListUtils.isEmpty(im_ids)) {
-                        AvatarHelper.getInstance().display(im_ids.get(position), model.imid, true, false);//显示圆角图片
                     }
                     break;
                 case 3:
@@ -689,6 +686,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         String nodename = jsonArray.getJSONObject(position).getString("JP_NODEDEALMANNAME");
                         JP_NODEID = jsonArray.getJSONObject(position).getString("JP_NODEID");
                         String codename = jsonArray.getJSONObject(position).getString("JP_NODENAME");
+                        int me_emid = jsonArray.getJSONObject(position).getInteger("EM_IMID");
                         if (!StringUtils.isEmpty(status)) {
                             if (status.equals("待审批")) {
                                 model.status.setTextColor(getResources().getColor(R.color.approvaling));
@@ -722,16 +720,15 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         model.status.setText(status);
 
                         model.JP_NODEID = JP_NODEID;
-                    }
-
-                    model.imid.setVisibility(View.GONE);
-                    model.meimid.setVisibility(View.VISIBLE);
-                    //设置显示审批人头像
-                    if (ListUtils.isEmpty(imids)) {
-                        String imageUri = "drawable://" + R.drawable.common_header_boy;
-                        AvatarHelper.getInstance().display(imageUri, model.meimid, true);
-                    } else if (!ListUtils.isEmpty(im_ids)) {
-                        AvatarHelper.getInstance().display(im_ids.get(position), model.meimid, true, false);//显示圆角图片
+                        //设置显示审批人头像
+                        model.imid.setVisibility(View.GONE);
+                        model.meimid.setVisibility(View.VISIBLE);
+                        if (me_emid != -1){
+                            AvatarHelper.getInstance().display(me_emid+"", model.meimid, true, false);//显示圆角图片
+                        }else {
+                            String imageUri = "drawable://" + R.drawable.common_header_boy;
+                            AvatarHelper.getInstance().display(imageUri, model.meimid, true);
+                        }
                     }
                     break;
             }