Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v2.0

# Conflicts:
#	WeiChat/build.gradle
#	app_core/common/src/main/res/layout/seach_include.xml

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -55,7 +55,6 @@ import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 /**
  * Created by Arison on 2017/8/25.
  */
-
 public class MyApplication extends BaseApplication {
 
     private static MyApplication INSTANCE = null;

app_core/common/src/main/java/com/core/base/EasyFragment.java

@@ -9,7 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.common.R;
+import com.core.app.R;
 import com.lidroid.xutils.ViewUtils;
 
 /**

app_core/common/src/main/java/com/core/dao/DBManager.java

@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteStatement;
 import android.util.Log;
 
 import com.common.LogUtil;
-import com.common.R;
+import com.core.app.R;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.db.DatabaseManager;

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

@@ -2,7 +2,7 @@ package com.core.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import com.common.R;
+import com.core.app.R;
 import com.core.app.MyApplication;
 
 public class EmployeesEntity implements Parcelable {

app_core/common/src/main/java/com/core/widget/ClearEditText.java

@@ -15,7 +15,7 @@ import android.view.animation.Animation;
 import android.view.animation.CycleInterpolator;
 import android.view.animation.TranslateAnimation;
 
-import com.common.R;
+import com.core.app.R;
 
 
 public class ClearEditText extends AppCompatEditText implements OnFocusChangeListener, TextWatcher {

app_core/common/src/main/java/com/core/widget/VoiceSearchView.java

@@ -9,7 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import com.common.R;
+import com.core.app.R;
 import com.core.utils.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechConstant;

app_core/common/src/main/java/com/core/xmpp/dao/ChatMessageDao.java

@@ -3,8 +3,8 @@ package com.core.xmpp.dao;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.common.BuildConfig;
 import com.common.data.CalendarUtil;
+import com.core.app.BuildConfig;
 import com.core.app.MyApplication;
 import com.core.db.SQLiteHelper;
 import com.core.db.SQLiteRawUtil;

app_core/common/src/main/java/com/core/xmpp/dao/FriendDao.java

@@ -5,7 +5,7 @@ import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.common.R;
+import com.core.app.R;
 import com.common.data.CalendarUtil;
 import com.core.app.MyApplication;
 import com.core.db.SQLiteHelper;