Bitliker:合并发布版本代码

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

@@ -37,8 +37,12 @@ public class CustomProgressDialog extends Dialog {
 
     @Override
     public void dismiss() {
-        if (context == null && this != null)
-            super.dismiss();
+        if (this != null)
+            try {
+                super.dismiss();
+            } catch (Exception e) {
+                Log.i("gongpengming", "Exception =" + (e == null ? "空的" : e.getMessage()));
+            }
     }
 
     public CustomProgressDialog(Context context, int theme) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -244,7 +244,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 onBackPressed();
                 break;
             case R.id.save:
-                if (save == 0 && MyApplication.getInstance().isNetworkActive()){
+                if (save == 0 && MyApplication.getInstance().isNetworkActive()) {
                     saveTask("");
                 }
                 break;
@@ -412,16 +412,13 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
             ToastMessage("开始时间必须小于截止时间");
             return;
         }
-        String[] people = et_task_people.getTags();
-        people = tagValues;
         String resourcename = "";
-        if (people != null) {
-            for (int i = 0; i < people.length; i++) {
-                if (i == people.length - 1) {
-                    resourcename = resourcename + people[i].trim();
-                } else {
-                    resourcename = resourcename + people[i].trim() + ",";
-                }
+        if (tagValues != null && tagValues.length > 0) {
+            try {
+                resourcename = getResourceName(tagValues);
+            } catch (Exception e) {
+                ToastMessage("执行人为必填项");
+                return;
             }
         } else {
             ToastMessage("执行人为必填项");
@@ -439,6 +436,15 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         sendDataToServer(formStore);
     }
 
+    private String getResourceName(String[] tagValues) throws Exception {
+        StringBuilder builder = new StringBuilder();
+        for (String e : tagValues)
+            if (!StringUtils.isEmpty(e))
+                builder.append(e.trim() + ",");
+        OACheckUtil.removieLast(builder);
+        return builder.toString();
+    }
+
 
     /**
      * 用于存放要合并的文件的集合
@@ -588,7 +594,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 if (ListUtils.isEmpty(employeesList)) {
                     selectNames = "";
                     selectCode = "";
-                    tagValues=null;
+                    tagValues = null;
                     et_task_people.setVisibility(View.GONE);
                     return;
                 }else{