Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

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

@@ -183,10 +183,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("GRAB_JOB_CONTENT", result);
                             if (!TextUtils.isEmpty(wd_finishedtask) || !TextUtils.isEmpty(wd_unfinishedtask)){
-//                                ToastMessage("尝试抓取工作内容");
                                 ToastMessage("工作内容抓取成功");
-                            }else {
-//                                ToastMessage("无工作内容");
                             }
                             judgeApprovers(mkeyValue);
 
@@ -212,45 +209,29 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                             if (!StringUtils.isEmpty(noid) && data != null && data.size() > 0){
                                 sendToSelect(noid, data);
                             } else{
-                                new Handler().postDelayed(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        progressDialog.dismiss();
-                                        jumptododetail(mkeyValue); //延时跳转，确认抓取成功
-
-                                    }
-                                }, 500);
+                                progressDialog.dismiss();
+                                jumptododetail(mkeyValue); //延时跳转，确认抓取成功
                             }
 
                         }else {
-                            new Handler().postDelayed(new Runnable() {
-                                @Override
-                                public void run() {
-                                    progressDialog.dismiss();
-                                    jumptododetail(mkeyValue); //延时跳转，确认抓取成功
-
-                                }
-                            }, 500);
+                            progressDialog.dismiss();
+                            jumptododetail(mkeyValue); //延时跳转，确认抓取成功
                         }
                     }else {
-                        new Handler().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                progressDialog.dismiss();
-                                jumptododetail(mkeyValue); //延时跳转，确认抓取成功
-
-                            }
-                        }, 500);
+                        progressDialog.dismiss();
+                        jumptododetail(mkeyValue); //延时跳转，确认抓取成功
                     }
                     break;
                 case 0x15:
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            jumptododetail(mkeyValue); //延时跳转，确认抓取成功
-
-                        }
-                    }, 500);
+//                    new Handler().postDelayed(new Runnable() {
+//                        @Override
+//                        public void run() {
+//                            jumptododetail(mkeyValue); //延时跳转，确认抓取成功
+//
+//                        }
+//                    }, 500);
+                    progressDialog.dismiss();
+                    jumptododetail(mkeyValue); //延时跳转，确认抓取成功
                     break;
 
 
@@ -375,6 +356,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         add_submit.setEnabled(true);
         startActivity(intent);
         finish();
+
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -23,6 +23,8 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 /**
  * @desc:工作
@@ -49,6 +51,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
     private TextView tv_oa;
     @ViewInject(R.id.show_new_function_ll)
     private LinearLayout show_new_function_ll;
+    private Boolean platform;
 
     @Override
     protected int inflateLayoutId() {
@@ -65,6 +68,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
 
 
     private void initView() {
+        platform = ApiUtils.getApiModel() instanceof ApiPlatform;
         rl_uas_sys.setOnClickListener(this);
         setting_rl.setOnClickListener(this);
         my_data_rl.setOnClickListener(this);
@@ -78,6 +82,10 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
             //TODO 发布版本先隐藏
             show_new_function_ll.setVisibility(View.INVISIBLE);
         }
+
+        if (platform){
+            my_client_rl.setVisibility(View.GONE);
+        }
     }
 
     @Override

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

@@ -591,6 +591,8 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                     tagValues=null;
                     et_task_people.setVisibility(View.GONE);
                     return;
+                }else{
+                    et_task_people.setVisibility(View.VISIBLE);
                 }
                 int i = 0;
                 StringBuilder select = new StringBuilder();

WeiChat/src/main/res/layout/plat_add_people.xml

@@ -187,7 +187,10 @@
                     android:background="@null"
                     android:hint="请输入(必填)"
                     android:textSize="15sp"
-                    android:gravity="center_vertical|right"/>
+                    android:gravity="center_vertical|right"
+                    whatever:testType="regexp"
+                    whatever:customRegexp="^([\\w-])+(\\.\\w+)*@([\\w-])+((\\.\\w{2,3}){1,3})$"
+                    whatever:testErrorString="请输入正确的邮箱格式"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"