Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

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

@@ -187,7 +187,13 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
                 && user_department_tv.testValidity() && user_job_tv.testValidity()
                 && user_email_tv.testValidity() && user_tel_tv.testValidity()
                 ){
-            saveRequest();
+
+            if (user_email_tv.getText().toString().contains("@")){
+                saveRequest();
+            }else {
+                ToastMessage("请输入正确的邮箱格式");
+            }
+
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/db/DBOpenHelper.java

@@ -1,37 +0,0 @@
-package com.xzjmyk.pm.newpedo.db;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-/**
- * Created by FANGLH
- * Date : 2017/4/13
- * To do :
- */
-
-public class DBOpenHelper extends SQLiteOpenHelper {
-    private static final String DB_NAME = "StepCounter.db"; //数据库名称
-    private static final int DB_VERSION = 1;//数据库版本,大于0
-
-    //用于创建Banner表
-    private static final String CREATE_BANNER = "create table step ("
-            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
-            + "curDate TEXT, "
-            + "totalSteps TEXT)";
-
-
-    public DBOpenHelper(Context context) {
-        super(context, DB_NAME, null,DB_VERSION);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(CREATE_BANNER);//执行有更改的sql语句
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
-    }
-}

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

@@ -37,7 +37,10 @@
                     android:background="@null"
                     android:hint="请输入(必填)"
                     android:textSize="15sp"
-                    android:gravity="center_vertical|right"/>
+                    android:gravity="center_vertical|right"
+                    whatever:testType="regexp"
+                    whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]+$"
+                    whatever:testErrorString="姓名只能为中、英文"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"