|
|
@@ -23,6 +23,7 @@ import com.afollestad.materialdialogs.MaterialDialog;
|
|
|
import com.common.LogUtil;
|
|
|
import com.common.data.CalendarUtil;
|
|
|
import com.common.data.ListUtils;
|
|
|
+import com.common.data.RegexUtil;
|
|
|
import com.common.data.StringUtil;
|
|
|
import com.core.app.AppConstant;
|
|
|
import com.core.app.MyApplication;
|
|
|
@@ -516,7 +517,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
|
|
|
holder.valueEt.addTextChangedListener(new TextChangListener(holder, position));
|
|
|
}
|
|
|
} else {
|
|
|
- if (isWeb(approval.getValues())) {
|
|
|
+ if (isWeb(approval)) {
|
|
|
setViewShowAble(true, holder.valueWeb);
|
|
|
setViewShowAble(false, holder.valueEt, holder.valueTv);
|
|
|
LogUtil.i("isWeb" + approval.getValues());
|
|
|
@@ -526,13 +527,13 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
|
|
|
setViewShowAble(false, holder.valueEt, holder.valueWeb);
|
|
|
if (!StringUtil.isEmpty(approval.getOldValues())) {//存在变更
|
|
|
holder.oldValueTv.setVisibility(View.VISIBLE);
|
|
|
- holder.oldValueTv.setText(approval.getOldValues());
|
|
|
+ holder.oldValueTv.setText(Html.fromHtml(approval.getOldValues()));
|
|
|
holder.valueTv.setText(getOldValues(approval.getOldValues(), approval.getValues()));
|
|
|
} else {
|
|
|
if (approval.isNumber()) {
|
|
|
holder.valueTv.setText(approval.getNumber());
|
|
|
} else {
|
|
|
- holder.valueTv.setText(approval.getValues());
|
|
|
+ holder.valueTv.setText(Html.fromHtml(approval.getValues()));
|
|
|
// holder.valueTv.setText(Html.fromHtml(approval.getValues()));
|
|
|
}
|
|
|
}
|
|
|
@@ -571,8 +572,9 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
|
|
|
return Html.fromHtml("<font color='#f10813'>" + values + "</font>");
|
|
|
}
|
|
|
|
|
|
- private boolean isWeb(String values) {
|
|
|
- return values != null && values.length() > 100 && values.contains("<br>");
|
|
|
+ private boolean isWeb(Approval approval) {
|
|
|
+ String values = approval.getValues();
|
|
|
+ return "MS".equals(approval.getDfType()) && values != null && values.contains("table");
|
|
|
}
|
|
|
|
|
|
private void showTimeSelect(final TextView showView, final int position) {
|