合并代码

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -80,8 +80,13 @@ public class ComGriddataInsideAdapter extends BaseAdapter {
             viewHolder.list_tv.setText(mGridconfigsBean.get(position).getDG_CAPTION());
             try {
                 if (griddataBeans.getString(mGridconfigsBean.get(position).getDG_FIELD()) != null) {
-                    viewHolder.value_tv.setText(griddataBeans.getString(mGridconfigsBean.get(position).getDG_FIELD()));
-                    Log.i("mmm",mGridconfigsBean.get(position).getDG_FIELD());
+                    if (!griddataBeans.getString(mGridconfigsBean.get(position).getDG_FIELD()).equals("null")){
+                        viewHolder.value_tv.setText(griddataBeans.getString(mGridconfigsBean.get(position).getDG_FIELD()));
+                        Log.i("mmm",mGridconfigsBean.get(position).getDG_FIELD());
+                    }else {
+                        viewHolder.value_tv.setText("");
+                    }
+
                 } else {
                     viewHolder.value_tv.setText("");
                 }
@@ -94,7 +99,6 @@ public class ComGriddataInsideAdapter extends BaseAdapter {
     }
 
     class ViewHolder {
-        TextView detail_title;
         TextView list_tv;
         TextView value_tv;
 

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

@@ -87,12 +87,11 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
         int datanum = mCommonApprovalFlowBean.getData().size();
         int processnum = mCommonApprovalFlowBean.getProcesss().size();
         viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME());
-        LogUtil.d(JSON.toJSONString(im_ids));
         if (im_ids == null || im_ids.get(getCount() - position - 1).equals("")
-                ||im_ids.get(getCount() - position - 1).equals("0")) {
+                || im_ids.get(getCount() - position - 1).equals("0")) {
            // viewHolder.AppFlowPhoto.setImageDrawable(new BitmapDrawable());
             String imageUri = "drawable://" + R.drawable.common_header_boy;
-            AvatarHelper.getInstance().display(imageUri, viewHolder.AppFlowPhoto, true);
+            AvatarHelper.getInstance().display(imageUri,viewHolder.AppFlowPhoto,true);
 
         } else {
 //            ImageLoader.getInstance().displayImage(url, viewHolder.AppFlowPhoto, MyApplication.mAvatarRoundImageOptions);
@@ -122,11 +121,12 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
 
                     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) {
+                    if (mCommonApprovalFlowBean.getNodes().get(datanum -position -1).getJn_dealResult() != null &&
+                            mCommonApprovalFlowBean.getNodes().get(datanum -position -1).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.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
+                        final String des_msg = mCommonApprovalFlowBean.getNodes().get(datanum -position -1).getJn_nodeDescription().toString();
                         viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
                             //点击查看详细批语
                             @Override
@@ -134,18 +134,20 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
                                 new AlertDialog
                                         .Builder(mContext)
                                         .setTitle("审批语详情")
-                                        .setMessage("\t" + mCommonApprovalFlowBean.getNodes().get(i).getJn_nodeDescription().toString())
+                                        .setMessage("\t" + des_msg)
                                         .setPositiveButton("确定", null)
                                         .show();
                             }
                         });
-                    } else if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult().equals("不同意")) {
+                    }else {
+                        viewHolder.AppFlowDescriptiontv.setText("");
+                    }
+                }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(datanum - position - 1).getJn_dealTime());
                     }
-                }
             } else if (position == (datanum - nodesnum - 1)) { //当前待处理的节点（nodes里面将要统计的数据）
                 if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum - 1)).getJn_dealResult().equals("同意")) {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);

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

@@ -77,10 +77,15 @@ public class CommonDocMainMsgAdapter extends BaseAdapter {
                 viewHolder.docmainmsg_list.setText(mFormconfigsBean.get(position).getFD_CAPTION());
                     try {
                         if (formdataBeans.getJSONObject(0).getString(mFormconfigsBean.get(position).getFD_FIELD()) != null) {
-                            Log.i("VALUE",mFormconfigsBean.get(position).getFD_FIELD().toString());
-                            viewHolder.docmainmsg_value.setText(formdataBeans.getJSONObject(0)
-                                    .getString(mFormconfigsBean.get(position).getFD_FIELD().toString()));
-                        } else {
+                            if (!formdataBeans.getJSONObject(0).getString(mFormconfigsBean.get(position).getFD_FIELD()).equals("null")){
+                                Log.i("VALUE",mFormconfigsBean.get(position).getFD_FIELD().toString());
+                                viewHolder.docmainmsg_value.setText(formdataBeans.getJSONObject(0)
+                                        .getString(mFormconfigsBean.get(position).getFD_FIELD().toString()));
+                            }else {
+                                viewHolder.docmainmsg_value.setText("");
+                            }
+
+                        } else  {
                             viewHolder.docmainmsg_value.setText("");
                         }
                     } catch (JSONException e) {

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

@@ -23,6 +23,7 @@ import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.List;
@@ -59,12 +60,20 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
     }
 
     public int getCount() {
-        return mCommonApprovalFlowBean == null ? 0 : mCommonApprovalFlowBean.getData().size();
+        if (ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){
+            return mCommonApprovalFlowBean == null ? 0 : mCommonApprovalFlowBean.getNodes().size();
+        }else{
+            return mCommonApprovalFlowBean == null ? 0 : mCommonApprovalFlowBean.getData().size();
+        }
     }
 
     @Override
     public Object getItem(int position) {
-        return mCommonApprovalFlowBean.getData().get(position);
+        if (ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){
+            return mCommonApprovalFlowBean.getNodes().get(position);
+        }else {
+            return mCommonApprovalFlowBean.getData().get(position);
+        }
     }
 
     @Override
@@ -92,90 +101,110 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
         }
 
         //ToDo 日报详情审批流过程显示，逻辑比较繁琐
+       if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())   // TODO 兼容某些情况下data[]审批人信息为空的情况
+               && !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
+               && mCommonApprovalFlowBean.getCurrentnode().getNodename() !=null
+               && ListUtils.isEmpty( mCommonApprovalFlowBean.getData())){
+           if (im_ids == null || im_ids.get(getCount() - position - 1).equals("")
+                   || im_ids.get(getCount() - position - 1).equals("0")) {
+               // viewHolder.AppFlowPhoto.setImageDrawable(new BitmapDrawable());
+               String imageUri = "drawable://" + R.drawable.common_header_boy;
+               AvatarHelper.getInstance().display(imageUri, viewHolder.AppFlowPhoto, true);
 
-        //获取 已审批节点数量 和总审批节点数
-        final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
-        int datanum = mCommonApprovalFlowBean.getData().size();
-        int processnum = mCommonApprovalFlowBean.getProcesss().size();
-        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME());
-        if (im_ids != null ) {
-            if ( 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);
-            }
+           } else {
+//            ImageLoader.getInstance().displayImage(url, viewHolder.AppFlowPhoto, MyApplication.mAvatarRoundImageOptions);
+               AvatarHelper.getInstance().display(im_ids.get(getCount() - position - 1), viewHolder.AppFlowPhoto, true, false);//显示圆角图片
+
+           }
+           viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+           viewHolder.AppFlowStatus.setText("已审批");
+           viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getNodes().get(getCount() - position - 1).getJn_dealManName());
+           viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes()
+                   .get(mCommonApprovalFlowBean.getNodes().size() - position - 1).getJn_dealTime());
+           viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
+       }else {
+           //获取 已审批节点数量 和总审批节点数
+           final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
+           final int datanum = mCommonApprovalFlowBean.getData().size();
+           int processnum = mCommonApprovalFlowBean.getProcesss().size();
+           viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME());
 
-            else {
+           if (im_ids == null || im_ids.get(getCount() - position - 1).equals("")
+                   || im_ids.get(getCount() - position - 1).equals("0")) {
+               // viewHolder.AppFlowPhoto.setImageDrawable(new BitmapDrawable());
+               String imageUri = "drawable://" + R.drawable.common_header_boy;
+               AvatarHelper.getInstance().display(imageUri, viewHolder.AppFlowPhoto, true);
+
+           } else {
 //            ImageLoader.getInstance().displayImage(url, viewHolder.AppFlowPhoto, MyApplication.mAvatarRoundImageOptions);
-                AvatarHelper.getInstance().display(im_ids.get(getCount() - position - 1), viewHolder.AppFlowPhoto, true, false);//显示圆角图片
-            }
+               AvatarHelper.getInstance().display(im_ids.get(getCount() - position - 1), viewHolder.AppFlowPhoto, true, false);//显示圆角图片
 
-        }
+           }
 
-       // TODO  审批流倒序排列
-        if (nodesnum == 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);
-                viewHolder.AppFlowTime.setText("");
-            } else {
-                viewHolder.AppFlowStatus.setText("");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
-            }
-        } 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(datanum - position - 1).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(datanum - position - 1).getJn_dealTime());
-                    }
-                }
-            } else if (position == (datanum - nodesnum - 1)) { //当前待处理的节点（nodes里面将要统计的数据）
-                    if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum - 1)).getJn_dealResult().equals("同意")) {
-                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-                        viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                        viewHolder.AppFlowStatus.setText("待审批");
-                        viewHolder.AppFlowTime.setText("");
-                    }
-            } else if (position < (datanum - nodesnum - 1)) {    //未走过审批流的节点
-                    viewHolder.AppFlowStatus.setText("");
-                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
-                    viewHolder.AppFlowTime.setText("");
-            }
-        }
+           // TODO  审批流倒序排列
+           if (nodesnum == 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);
+                   viewHolder.AppFlowTime.setText("");
+               } else {
+                   viewHolder.AppFlowStatus.setText("");
+                   viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+               }
+           } 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(datanum - position - 1).getJn_dealTime());
+
+                       //当有审批时判断有没有审批语
+                       if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealResult() != null &&
+                               mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription() != null) {
+                           viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
+                           viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                           viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
+                           final String des_msg = mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
+                           viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
+                               //点击查看详细批语
+                               @Override
+                               public void onClick(View v) {
+                                   new AlertDialog
+                                           .Builder(mContext)
+                                           .setTitle("审批语详情")
+                                           .setMessage("\t" + des_msg)
+                                           .setPositiveButton("确定", null)
+                                           .show();
+                               }
+                           });
+                       } else {
+                           viewHolder.AppFlowDescriptiontv.setText("");
+                       }
+                   } 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(datanum - position - 1).getJn_dealTime());
+                   }
 
+               } else if (position == (datanum - nodesnum - 1)) { //当前待处理的节点（nodes里面将要统计的数据）
+                   if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum - 1)).getJn_dealResult().equals("同意")) {
+                       viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                       viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                       viewHolder.AppFlowStatus.setText("待审批");
+                       viewHolder.AppFlowTime.setText("");
+                   }
+               } else if (position < (datanum - nodesnum - 1)) {    //未走过审批流的节点
+                   viewHolder.AppFlowStatus.setText("");
+                   viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                   viewHolder.AppFlowTime.setText("");
+               }
+           }
 
+       }
         //TODO 审批流顺序排列
         /*
         审批流顺序排列

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

@@ -1,163 +0,0 @@
-package com.xzjmyk.pm.activity.adapter;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-
-import java.util.List;
-
-
-/**
- * Created by FANGlh on 2016/11/4.
- */
-public class WorkDailyApprovalFlowAdapter extends BaseAdapter {
-    private CommonApprovalFlowBean mCommonApprovalFlowBean;
-    private Context mContext;
-    DBManager manager;
-
-    public WorkDailyApprovalFlowAdapter(Context mContext) {
-        manager = new DBManager(mContext);
-        this.mContext = mContext;
-
-
-    }
-
-    public CommonApprovalFlowBean getmCommonApprovalFlowBean() {
-        return mCommonApprovalFlowBean;
-    }
-
-    public void setmCommonApprovalFlowBean(CommonApprovalFlowBean mCommonApprovalFlowBeanList) {
-        this.mCommonApprovalFlowBean = mCommonApprovalFlowBeanList;
-    }
-
-    public int getCount() {
-        return mCommonApprovalFlowBean == null ? 0 : mCommonApprovalFlowBean.getData().size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return mCommonApprovalFlowBean.getData().get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder viewHolder = null;
-        if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.item_daily_details_approval_flow, null);
-            viewHolder = new ViewHolder();
-            viewHolder.AppFlowNode = (ImageView) convertView.findViewById(R.id.item_daily_details_approval_flow_node_img);
-            viewHolder.AppFlowPhoto = (ImageView) convertView.findViewById(R.id.item_daily_details_approval_flow_photo_img);
-            viewHolder.AppFlowName = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_name_tv);
-            viewHolder.AppFlowStatus = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_status_tv);
-            viewHolder.AppFlowTime = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_time_tv);
-            viewHolder.AppFlowDescriptionll = (LinearLayout) convertView.findViewById(R.id.Description_ll);
-            viewHolder.AppFlowDescriptiontv = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_statusDescription_tv);
-            convertView.setTag(viewHolder);
-        } else {
-            viewHolder = (ViewHolder) convertView.getTag();
-        }
-
-        //ToDo 单据详情审批流过程显示，逻辑比较繁琐
-
-        //获取 已审批节点数量 和总审批节点数
-        int nodesnum = mCommonApprovalFlowBean.getNodes().size();
-        int datanum = mCommonApprovalFlowBean.getData().size();
-        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-        //当审批流为空时默认第一个审批人为审批节点
-        if(mCommonApprovalFlowBean.getNodes() == null ||nodesnum <= 0){
-           viewHolder.AppFlowTime.setText(null);
-            viewHolder.AppFlowStatus.setText(null);
-            viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-            if(position == 0){
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                viewHolder.AppFlowStatus.setText("待审批");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-            }
-        }else{
-            if (position < nodesnum && datanum > 0){
-                String approval_status = mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult();
-                if (!approval_status.isEmpty() && approval_status.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());
-                    if(mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription() != null){
-                        viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
-                        viewHolder.AppFlowDescriptiontv.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString());
-                    }
-                }
-
-                else if(!approval_status.isEmpty() && approval_status.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());
-                }
-
-                else if(position == (nodesnum -1)) {
-
-                }
-
-                //当节点为none状态是gone掉默认审批状态和时间
-                else {
-                    viewHolder.AppFlowStatus.setText(null);
-                    viewHolder.AppFlowTime.setText(null);
-                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
-                }
-            } //当节点是待审批状态时
-            else if(position == nodesnum && position <=datanum && mCommonApprovalFlowBean.getData().get(position).getJP_NODENAME().equals(mCommonApprovalFlowBean.getCurrentnode().getNodename())){
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                viewHolder.AppFlowStatus.setText("待审批");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-            }
-
-            //TODO 从im获取头像
-       /* try {
-            if (manager == null) manager = new DBManager(mContext);
-            String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
-            String emCode = mCommonApprovalFlowBean.get(position).getJn_dealManId();
-            String[] selectionArgs = {emCode, whichsys};
-            String selection = "em_code=? and whichsys=?";
-            //获取数据库数据
-            EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
-            if (bean!=null){
-                String imId = String.valueOf(bean.getEm_IMID());
-                Log.i("todo", "imId=" + imId);
-                AvatarHelper.getInstance().displayAvatar(imId, viewHolder.AppFlowPhoto, true);
-            }
-
-        } catch (Exception e) {
-
-
-        }*/
-            }
-
-
-        return convertView;
-    }
-
-    class ViewHolder {
-        ImageView AppFlowNode;
-        ImageView AppFlowPhoto;
-        TextView AppFlowName;
-        TextView AppFlowStatus;
-        TextView AppFlowTime;
-        LinearLayout AppFlowDescriptionll;
-        TextView AppFlowDescriptiontv;
-
-    }
-}

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

@@ -369,10 +369,10 @@ public class CommonDocDetailsActivity extends BaseActivity {
                               im_ids.add(imId);
                           } else {
                               im_ids.add("");
-                              ToastMessage("审批流头像获取异常，已显示为默认");
+//                              ToastMessage("审批流头像获取异常，已显示为默认");
                           }
-                          Log.i("imids", im_ids.toString());
                           mCommonDocApprovalFlowAdapter.setIm_ids(im_ids);
+                          Log.i("afimids", im_ids.toString());
                       }catch (Exception e){
                           e.printStackTrace();
                       }
@@ -395,18 +395,21 @@ public class CommonDocDetailsActivity extends BaseActivity {
      */
     public void ShowApplyPeoMsg() {
         // TODO 当单据是提交状态 触发审批流时获取
-            if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes()) && !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())) {
+            if ( !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())) {
                 String em_number = mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherId();   //申请人编号 从process获取
                 name_tv.setText(mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherName());  //申请人姓名 从process获取
-                int data_num = mCommonApprovalFlowBean.getData().size();
-                int nodes_num = mCommonApprovalFlowBean.getNodes().size();
-                String app_status = mCommonApprovalFlowBean.getNodes().get(nodes_num - 1).getJn_dealResult();
-                if ((nodes_num == data_num && nodes_num > 0) &&
-                        mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult() != null &&
-                        mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult().equals("同意")) {
-                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
-                    status_tv.setText("已审批");
-                } else {
+                if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())){
+                    int data_num = mCommonApprovalFlowBean.getData().size();
+                    int nodes_num = mCommonApprovalFlowBean.getNodes().size();
+                    String app_status = mCommonApprovalFlowBean.getNodes().get(nodes_num - 1).getJn_dealResult();
+                    if ((nodes_num == data_num && nodes_num > 0) &&
+                            mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult() != null &&
+                            mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult().equals("同意")) {
+                        status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
+                        status_tv.setText("已审批");
+                    }
+                }
+                else {
                     status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
                     status_tv.setText("待审批");
                 }
@@ -440,7 +443,14 @@ public class CommonDocDetailsActivity extends BaseActivity {
                       e.printStackTrace();
                   }
                 }
-            } else {
+            } else if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
+                    && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
+                    && ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){
+
+                status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.titleBlue));
+                status_tv.setText("未提交");
+              
+            }else {
                 status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
                 status_tv.setText("待审批");
             }

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

@@ -28,6 +28,7 @@ import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.MyListView;
@@ -63,7 +64,6 @@ public class DailydetailsActivity extends BaseActivity {
     private DailyDetailsApprovalFlowAdapter mDailyDetailsApprovalFlowAdapter;
     private DailyDetailsWorkTaskAdapter mDailyDetailsWorkTaskAdapter;
     private CommonApprovalFlowBean mCommonApprovalFlowBean;
-    private CommonApprovalFlowBean.CurrentnodeBean currentnode;
 
     private List<WorkTaskBean> mWorkTaskBeanList;
     private EmptyLayout mEmptyLayput_approvalflow;
@@ -75,8 +75,8 @@ public class DailydetailsActivity extends BaseActivity {
     private final static int APPROVAL_FLOW_NODE = 102;
     private DBManager manager;
     private List<String> im_ids;
-    private TextView addDaily;
     private ImageView unsubmit_iv;
+    private TextView addDaily;
 
 
     @Override
@@ -210,7 +210,7 @@ public class DailydetailsActivity extends BaseActivity {
             switch(msg.what){
                 case APPROVAL_FLOW_NODE:
                     String result = msg.getData().getString("result");
-                    LogUtil.prinlnLongMsg("approvelnodemsg", result);
+                    LogUtil.prinlnLongMsg("wdaf_result", result);
                     try{
                         JSONObject resultJsonObject = new JSONObject(result);
                         //JSONArray dailynodeArray = resultJsonObject.getJSONArray("nodes");
@@ -220,8 +220,9 @@ public class DailydetailsActivity extends BaseActivity {
                             mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
                             LogUtil.prinlnLongMsg("mCommonApprovalFlowBean", mCommonApprovalFlowBean.toString());
                             if(mCommonApprovalFlowBean.getData().size()<=0 ){
-                                mEmptyLayput_approvalflow.showEmpty();
-                                ToastMessage("日报审批流数据获取异常");
+                                Showflownodata(mCommonApprovalFlowBean);
+//                                mEmptyLayput_approvalflow.showEmpty();
+//                                ToastMessage("日报审批流数据获取异常");
                             }else {
                                 //TODO 从im获取头像
                                 for (int i = 0; i < mCommonApprovalFlowBean.getData().size(); i++) {
@@ -248,7 +249,7 @@ public class DailydetailsActivity extends BaseActivity {
                                             im_ids.add(imId);
                                         }else {
                                             im_ids.add("");
-                                            ToastMessage("审批流头像获取异常，已显示为默认");
+//                                            ToastMessage("审批流头像获取异常，已显示为默认");
                                         }
                                     }catch (Exception e){
                                         e.printStackTrace();
@@ -267,7 +268,7 @@ public class DailydetailsActivity extends BaseActivity {
                             int datanum = mCommonApprovalFlowBean.getData().size();
                             if(nodesnum > 0 && datanum > 0 && nodesnum == datanum){
                                 if(mCommonApprovalFlowBean.getNodes().get(nodesnum-1).getJn_dealResult().equals("同意")){
-                                    wdd_status.setTextColor(mContext.getResources().getColor(R.color.approval));
+                                    wdd_status.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
                                     wdd_status.setText("已审批");
                                 }
                             }
@@ -313,6 +314,60 @@ public class DailydetailsActivity extends BaseActivity {
         }
     };
 
+    /**
+     * TODO 兼容data[]审批人信息为空的情况，UAS部门这里data全部异常,！！
+     * Todo nodesnum = datanum && 最终已审批状态显示
+     * @param mCommonApprovalFlowBean
+     */
+    private void Showflownodata(CommonApprovalFlowBean mCommonApprovalFlowBean) {
+        if(!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
+                && !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
+                && mCommonApprovalFlowBean.getCurrentnode().getNodename() !=null) {
+            int uas_nodes_num = mCommonApprovalFlowBean.getNodes().size();
+            if (mCommonApprovalFlowBean.getNodes().get(uas_nodes_num - 1).getJn_name()
+                    .equals(mCommonApprovalFlowBean.getCurrentnode().getNodename())) {
+                //TODO 从im获取头像
+                for (int i = 0; i < mCommonApprovalFlowBean.getNodes().size(); i++) {
+                    if (manager == null) manager = new DBManager(mContext);
+                    String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+                    String emCode = mCommonApprovalFlowBean.getNodes().get(i).getJn_dealManId();
+                    if (emCode.contains(",")) {
+//                                        im_ids.add("");
+                        String str[] = emCode.split(",");
+                        emCode = str[0];
+                        ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
+                    }
+                    //TODO 当处理当在Pc端不填写工作总结保存或提交时，在手机端查看详情界面这里出引起闪退：try 已解决
+                    try {
+                        String[] selectionArgs = {emCode, whichsys};
+                        String selection = "em_code=? and whichsys=? ";
+                        //获取数据库数据
+                        EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                        if (bean != null) {
+                            String imId = String.valueOf(bean.getEm_IMID());
+                            Log.i("todo", "imId=" + imId);
+                            im_ids.add(imId);
+                        } else {
+                            im_ids.add("");
+//                                            ToastMessage("审批流头像获取异常，已显示为默认");
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+            }
+                Log.i("imids", im_ids.toString());
+            mDailyDetailsApprovalFlowAdapter.setIm_ids(im_ids);
+
+            //TODO 设置数据之前先通过数据库获取到所有的imid保存到内存中
+            mDailyDetailsApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
+            approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
+
+        }else {
+                mEmptyLayput_approvalflow.showEmpty();
+            }
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

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

@@ -47,7 +47,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.QueryActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.TaskAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.OAListAdapter;
 import com.xzjmyk.pm.activity.ui.erp.fragment.CalendarFragmet;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
@@ -797,8 +796,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 break;
             case R.id.outtask://出差申请
                 //startActivity(new Intent(activity, TravelRequestActivity.class));
-//                ToastUtil.showToast(activity, "该功能还在内测中");
-                startActivity(new Intent(mContext, DataFormDetailActivity.class));
+                ToastUtil.showToast(activity, "该功能还在内测中");
+//                startActivity(new Intent(mContext,DataFormDetailActivity.class));
 //                        .putExtra("caller", "Workovertime"));
 //                .putExtra("caller", "Ask4Leave"));
 //                .putExtra("caller", "FeePlease!CCSQ"));

WeiChat/src/main/res/layout/activity_common_docui.xml

@@ -31,7 +31,6 @@
                 android:id="@+id/common_docui_photo_img"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
-               
                 android:contentDescription="@string/app_name"
                 android:layout_marginTop="5dp"
                 android:layout_marginBottom="5dp" />

WeiChat/src/main/res/menu/menu_work_home.xml

@@ -5,8 +5,8 @@
 
     <item
         android:id="@+id/work_home"
-        android:icon="@drawable/icon_work_home"
-        android:title="@string/oa_home"
+        android:icon="@drawable/work_home"
+        android:title="@string/work_home"
         app:showAsAction="ifRoom"/>
 
 </menu>

WeiChat/src/main/res/values/strings.xml

@@ -221,7 +221,7 @@
     <string name="nearest">关注群</string>
     <string name="bisniss">我的朋友</string>
     <string name="share">分享</string>
-    <string name="oa_home">OA主界面</string>
+    <string name="work_home">工作主界面</string>
     <!-- 加好友 -->
     <string name="remark_name_format_error">备注名不合法，只允许中文、英文、字母和下划线，且长度为3至10个字符</string>
     <string name="unilateral_attention">单向关注</string>