Browse Source

考勤单据申请数据显示之前:备份

FANGLH 9 years ago
parent
commit
204646718f

+ 72 - 43
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/CommonDocApprovalFlowAdapter.java

@@ -1,7 +1,11 @@
 package com.xzjmyk.pm.activity.adapter;
 
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.res.Resources;
+import android.net.Uri;
 import android.support.v7.app.AlertDialog;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -9,6 +13,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
@@ -87,64 +93,87 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
         //ToDo 日报详情审批流过程显示,逻辑比较繁琐
 
         //获取 已审批节点数量 和总审批节点数
-        int nodesnum = mCommonApprovalFlowBean.getNodes().size();
+        final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
         int processnum = mCommonApprovalFlowBean.getProcesss().size();
-        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-        if (im_ids != null && im_ids.get(position).equals("")) {
-            viewHolder.AppFlowPhoto.setImageResource(R.drawable.common_header_boy);
+        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME());
+        if (im_ids != null && im_ids.get(getCount() - position - 1).equals("")) {
+
+            Resources r = mContext.getResources();
+            String url = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
+                    + r.getResourcePackageName(R.drawable.common_header_boy) + "://"
+                    + r.getResourceTypeName(R.drawable.common_header_boy) + "://"
+                    + r.getResourceEntryName(R.drawable.common_header_boy)).toString();
+            ImageLoader.getInstance().displayImage(url, viewHolder.AppFlowPhoto, MyApplication.mAvatarRoundImageOptions);
+            Log.i("imurl", url);
+
         } else {
-//            AvatarHelper.getInstance().displayAvatar(im_ids.get(position), viewHolder.AppFlowPhoto, false);
-            AvatarHelper.getInstance().display(im_ids.get(position),viewHolder.AppFlowPhoto,true,false);  //显示圆角图片
+//            ImageLoader.getInstance().displayImage(url, viewHolder.AppFlowPhoto, MyApplication.mAvatarRoundImageOptions);
+            AvatarHelper.getInstance().display(im_ids.get(getCount() - position - 1),viewHolder.AppFlowPhoto,true,false);//显示圆角图片
+
         }
 
+        // 审批流倒序排列
         if (nodesnum == 0) {
-            if (position == 0) {
+            if (mCommonApprovalFlowBean.getCurrentnode().getNodename()
+                    .equals(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODENAME())) {
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                 viewHolder.AppFlowStatus.setText("待审批");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
             } else {
+                viewHolder.AppFlowStatus.setText("");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
             }
-        } else if ((nodesnum > 0 && position < nodesnum) || (nodesnum == 1 && datanum == 1)) {
-            if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("同意")) {
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                viewHolder.AppFlowStatus.setText("已审批");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
-                viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
-
-            } else if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("不同意")) {
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                viewHolder.AppFlowStatus.setText("不同意");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-                viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
-            }
-
-            //当有审批时判断有没有审批语
-            if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult() != null &&
-                    mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription() != null) {
-                viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
-                viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString() + " )");
-                viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
-                    //点击查看详细批语
-                    @Override
-                    public void onClick(View v) {
-                        new AlertDialog
-                                .Builder(mContext)
-                                .setTitle("审批语详情")
-                                .setMessage("\t"+mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString())
-                                .setPositiveButton("确定", null)
-                                .show();
+        } else {
+            if (position > (datanum - nodesnum - 1)) {
+                if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult().equals("同意")) {
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                    viewHolder.AppFlowStatus.setText("已审批");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealTime());
+
+                    final int i = position - (datanum - nodesnum);
+                    //当有审批时判断有没有审批语
+                    if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult() != null &&
+                            mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_nodeDescription() != null) {
+                        viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
+                        viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                        viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_nodeDescription().toString() + " )");
+                        viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
+                            //点击查看详细批语
+                            @Override
+                            public void onClick(View v) {
+                                new AlertDialog
+                                        .Builder(mContext)
+                                        .setTitle("审批语详情")
+                                        .setMessage("\t" + mCommonApprovalFlowBean.getNodes().get(i).getJn_nodeDescription().toString())
+                                        .setPositiveButton("确定", null)
+                                        .show();
+                            }
+                        });
                     }
-                });
+                } else if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult().equals("不同意")) {
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                    viewHolder.AppFlowStatus.setText("不同意");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealTime());
+                }
+
+            }else {
+                if (position == (datanum - nodesnum - 1)){
+                    if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("同意")){
+                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                        viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                        viewHolder.AppFlowStatus.setText("待审批");
+                    }
+                }else {
+                    viewHolder.AppFlowStatus.setText("");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                    viewHolder.AppFlowTime.setText("");
+                }
             }
-            //当审批节点为待审批时
-        }else if (nodesnum > 0 && nodesnum < datanum && position == nodesnum){
-            viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-            viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-            viewHolder.AppFlowStatus.setText("待审批");
         }
+
         return convertView;
     }
 

+ 2 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/DailyDetailsApprovalFlowAdapter.java

@@ -96,8 +96,6 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
         //ToDo 日报详情审批流过程显示,逻辑比较繁琐
 
         //获取 已审批节点数量 和总审批节点数
-        /*int currposition = position;
-        position = getCount() - position - 1;*/
         final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
         int processnum = mCommonApprovalFlowBean.getProcesss().size();
@@ -118,6 +116,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
 
         }
 
+       // 审批流倒序排列
         if (nodesnum == 0) {
             if (mCommonApprovalFlowBean.getCurrentnode().getNodename()
                     .equals(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODENAME())) {
@@ -162,9 +161,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealTime());
                 }
-                /*if (mCommonApprovalFlowBean.getNodes().get(nodesnum - 1).getJn_dealResult().equals("同意")){
 
-                }*/
             }else {
                 if (position == (datanum - nodesnum - 1)){
                     if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("同意")){
@@ -183,6 +180,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
 
 
         /*
+        审批流顺序排列
         if ((nodesnum > 0 && position > nodesnum-1 && position < datanum) || (nodesnum == 1 && datanum == 1)) {
             if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("同意")) {
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));