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

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

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

@@ -75,7 +75,7 @@ public class NodeAdapter extends BaseAdapter {
         }
         int textColor = R.color.hintColor;
         if (!StringUtil.isEmpty(approval.getIdKey())) {
-            holder.valuesTv.setText(approval.getIdKey());
+            holder.valuesTv.setText(approval.getIdKey().replace("\\n","\n"));
             if (approval.getIdKey().startsWith("待审批")) {
                 textColor = R.color.approvaling;
             } else if (approval.getIdKey().startsWith("未通过")) {