合并代码，ContactsActivity 代码没动，采用网上分支

2.处理消息首页的闪烁问题

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/approvautils/NodeAdapter.java

@@ -22,95 +22,95 @@ import java.util.List;
 
 public class NodeAdapter extends BaseAdapter {
 
-    private Context ct;
-    private List<Approval> approvals;
-
-
-    public NodeAdapter(Context ct, List<Approval> approvals) {
-        this.ct = ct;
-        this.approvals = approvals;
-    }
-
-    @Override
-    public int getCount() {
-        return ListUtils.getSize(approvals);
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return approvals.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View itemView, ViewGroup parent) {
-        NodeViewHolder holder = null;
-        if (itemView == null) {
-            holder = new NodeViewHolder();
-            itemView = LayoutInflater.from(ct).inflate(R.layout.item_approval_node, parent, false);
-            holder.timeTv = (TextView) itemView.findViewById(R.id.timeTv);
-            holder.keyTv = (TextView) itemView.findViewById(R.id.keyTv);
-            holder.valuesTv = (TextView) itemView.findViewById(R.id.valuesTv);
-            holder.handIv = (ImageView) itemView.findViewById(R.id.handIv);
-            holder.statusIV = (ImageView) itemView.findViewById(R.id.statusIV);
-            holder.padding = itemView.findViewById(R.id.padding);
-            itemView.setTag(holder);
-        } else {
-            holder = (NodeViewHolder) itemView.getTag();
-        }
-        bindNodeView(holder, position);
-        return itemView;
-    }
-
-    private void bindNodeView(NodeViewHolder holder, int position) {
-        Approval approval = approvals.get(position);
-        if (position > 0 && approvals.get(position - 1).getType() != Approval.NODES) {
-            holder.padding.setVisibility(View.VISIBLE);
-        } else {
-            holder.padding.setVisibility(View.GONE);
-        }
-        int textColor = R.color.hintColor;
-        if (!StringUtil.isEmpty(approval.getIdKey())) {
-            holder.valuesTv.setText(approval.getIdKey().replace("\\n","\n"));
-            if (approval.getIdKey().startsWith("待审批")) {
-                textColor = R.color.approvaling;
-            } else if (approval.getIdKey().startsWith("未通过")) {
-                textColor = R.color.crimson;
-            }
-        } else {
-            holder.valuesTv.setText("");
-        }
-        holder.valuesTv.setTextColor(ct.getResources().getColor(textColor));
-        holder.keyTv.setText(approval.getCaption());
-        int reId = R.drawable.weishenpi;
-        if (!StringUtil.isEmpty(approval.getIdKey())) {
-            String status = approval.getIdKey().split("\\(")[0];
-            if (StringUtil.isEmpty(status)) status = "";
-            if ("已审批".equals(status)) {
-                reId = R.drawable.node_finished3;
-            } else if ("待审批".equals(status)) {
-                reId = R.drawable.daishenpi;
-            } else if ("未通过".equals(status)) {
-                reId = R.drawable.node_delete;
-            } else {
-                reId = R.drawable.weishenpi;
-            }
-        }
-        holder.statusIV.setImageResource(reId);
-        AvatarHelper.getInstance().display(String.valueOf(approval.getId()), holder.handIv, true, false);
-        holder.timeTv.setTextColor(ct.getResources().getColor(R.color.text_normal));
-        holder.timeTv.setText(approval.getValues());
-    }
-
-    private class NodeViewHolder {
-        ImageView handIv, statusIV;
-        TextView timeTv, keyTv, valuesTv;
-        View padding;
-
-
-    }
+	private Context ct;
+	private List<Approval> approvals;
+
+
+	public NodeAdapter(Context ct, List<Approval> approvals) {
+		this.ct = ct;
+		this.approvals = approvals;
+	}
+
+	@Override
+	public int getCount() {
+		return ListUtils.getSize(approvals);
+	}
+
+	@Override
+	public Object getItem(int position) {
+		return approvals.get(position);
+	}
+
+	@Override
+	public long getItemId(int position) {
+		return position;
+	}
+
+	@Override
+	public View getView(int position, View itemView, ViewGroup parent) {
+		NodeViewHolder holder = null;
+		if (itemView == null) {
+			holder = new NodeViewHolder();
+			itemView = LayoutInflater.from(ct).inflate(R.layout.item_approval_node, parent, false);
+			holder.timeTv = (TextView) itemView.findViewById(R.id.timeTv);
+			holder.keyTv = (TextView) itemView.findViewById(R.id.keyTv);
+			holder.valuesTv = (TextView) itemView.findViewById(R.id.valuesTv);
+			holder.handIv = (ImageView) itemView.findViewById(R.id.handIv);
+			holder.statusIV = (ImageView) itemView.findViewById(R.id.statusIV);
+			holder.padding = itemView.findViewById(R.id.padding);
+			itemView.setTag(holder);
+		} else {
+			holder = (NodeViewHolder) itemView.getTag();
+		}
+		bindNodeView(holder, position);
+		return itemView;
+	}
+
+	private void bindNodeView(NodeViewHolder holder, int position) {
+		Approval approval = approvals.get(position);
+		if (position > 0 && approvals.get(position - 1).getType() != Approval.NODES) {
+			holder.padding.setVisibility(View.VISIBLE);
+		} else {
+			holder.padding.setVisibility(View.GONE);
+		}
+		int textColor = R.color.hintColor;
+		if (!StringUtil.isEmpty(approval.getIdKey())) {
+			holder.valuesTv.setText(approval.getIdKey().replace("\\n", "\n"));
+			if (approval.getIdKey().startsWith("待审批")) {
+				textColor = R.color.approvaling;
+			} else if (approval.getIdKey().startsWith("未通过")) {
+				textColor = R.color.crimson;
+			}
+		} else {
+			holder.valuesTv.setText("");
+		}
+		holder.valuesTv.setTextColor(ct.getResources().getColor(textColor));
+		holder.keyTv.setText(approval.getCaption());
+		int reId = R.drawable.weishenpi;
+		if (!StringUtil.isEmpty(approval.getIdKey())) {
+			String status = approval.getIdKey().split("\\(")[0];
+			if (StringUtil.isEmpty(status)) status = "";
+			if ("已审批".equals(status)) {
+				reId = R.drawable.node_finished3;
+			} else if ("待审批".equals(status)) {
+				reId = R.drawable.daishenpi;
+			} else if ("未通过".equals(status)) {
+				reId = R.drawable.node_delete;
+			} else {
+				reId = R.drawable.weishenpi;
+			}
+		}
+		holder.statusIV.setImageResource(reId);
+		AvatarHelper.getInstance().display(String.valueOf(approval.getId()), holder.handIv, true, false);
+		holder.timeTv.setTextColor(ct.getResources().getColor(R.color.text_normal));
+		holder.timeTv.setText(approval.getValues());
+	}
+
+	private class NodeViewHolder {
+		ImageView handIv, statusIV;
+		TextView timeTv, keyTv, valuesTv;
+		View padding;
+
+
+	}
 }