整合审批流类

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

@@ -53,8 +53,6 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IApproval;
 import com.xzjmyk.pm.activity.ui.message.SelectActivity;
 import com.xzjmyk.pm.activity.view.CrashLinearLayoutManager;
 
-import org.jivesoftware.smack.util.StringUtils;
-
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -133,7 +131,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data != null && requestCode == 0x20) {
             SelectEmUser user = data.getParcelableExtra("data");
-            if (user != null && !StringUtils.isEmpty(user.getEmCode())) {
+            if (user != null && !StringUtil.isEmpty(user.getEmCode())) {
                 mPresenter.updateAssignee(user.getEmCode(), StringUtil.getTextRexHttp(opinionET));
             }
         } else if (0x22 == requestCode || 0x21 == requestCode) {
@@ -143,13 +141,13 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
                 name = d.getName();
             }
             if (0x21 == requestCode) {
-                if (!StringUtils.isEmpty(name)) {
+                if (!StringUtil.isEmpty(name)) {
                     getEmnameByReturn(name);
                 } else {
                     mPresenter.loadNextProcess();
                 }
             } else if (0x22 == requestCode) {
-                if (!StringUtils.isEmpty(name)) {
+                if (!StringUtil.isEmpty(name)) {
                     if (name.equals("回退给制单人")) {
                         name = "RECORDER";
                     }
@@ -190,7 +188,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
                 }
             }
         });
-        if (!StringUtils.isEmpty(title)) {
+        if (!StringUtil.isEmpty(title)) {
             getSupportActionBar().setTitle(title);
             if (getString(R.string.title_approval).equals(title)) {
                 opinionRL.setVisibility(View.VISIBLE);
@@ -205,12 +203,12 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
     }
 
     private void getEmnameByReturn(String text) {
-        if (StringUtils.isEmpty(text)) return;
+        if (StringUtil.isEmpty(text)) return;
         Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
         Matcher matcher = pattern.matcher(text);
         while (matcher.find()) {
             String name = matcher.group();
-            if (!StringUtils.isEmpty(name)) {
+            if (!StringUtil.isEmpty(name)) {
                 mPresenter.loadTakeOver2Other(name);
                 return;
             }
@@ -229,7 +227,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
                 break;
             case R.id.disagreeTV://不同意
                 List<String> nodes = mPresenter.getNodesCanReturn();
-                if (StringUtils.isEmpty(StringUtil.getTextRexHttp(opinionET))) {
+                if (StringUtil.isEmpty(StringUtil.getTextRexHttp(opinionET))) {
                     opinionET.setFocusable(true);
                     showToast(R.string.approval_opinion_error, R.color.load_submit);
                 } else {
@@ -257,7 +255,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
     }
 
     private void selectEmCode() {
-        if (StringUtils.isEmpty(StringUtil.getTextRexHttp(opinionET))) {
+        if (StringUtil.isEmpty(StringUtil.getTextRexHttp(opinionET))) {
             showToast(R.string.approval_opinion_error, R.color.load_submit);
             return;
         }
@@ -275,7 +273,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        if (!StringUtils.isEmpty(text)) {
+        if (!StringUtil.isEmpty(text)) {
             opinionET.setText(opinionET.getText() + text);
         }
     }
@@ -288,7 +286,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
 
     @Override
     public void nodeDealMan(String nodeDealMan) {
-        if (StringUtils.isEmpty(nodeDealMan)) {
+        if (StringUtil.isEmpty(nodeDealMan)) {
             findViewById(R.id.changedealmanTV).setVisibility(View.GONE);
             findViewById(R.id.disagreeTV).setVisibility(View.GONE);
             findViewById(R.id.agreeTV).setVisibility(View.GONE);

app_core/common/src/main/java/com/core/model/Friend.java

@@ -337,6 +337,16 @@ public class Friend implements Serializable {
         this.roomTalkTime = roomTalkTime;
     }
 
+    /* 快捷方法，获取在好友列表中显示的名称 */
+    public String getShowName() {
+        if (!TextUtils.isEmpty(remarkName)) {
+            return remarkName.trim();
+        } else if (!TextUtils.isEmpty(nickName)) {
+            return nickName.trim();
+        } else {
+            return "";
+        }
+    }
 
     /**
      * 快捷方法