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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/UserRoleUtils.java
#	app_core/common/src/main/java/com/core/net/http/ViewUtil.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Nov 18 18:46:27 CST 2017
+#Mon Nov 20 09:12:31 CST 2017
 debugName=1
 versionName=618
-debugCode=17
+debugCode=19
 versionCode=118

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

@@ -16,8 +16,8 @@ public class Constants {
     public static String IM_BASE_URL() {
         String url = "";
         if (BaseConfig.isDebug()) {
-//            url = IM_BASE_URL_TEST;
-            url = IM_BASE_URL;
+           url = IM_BASE_URL_TEST;
+            //url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1034,8 +1034,8 @@ public class ViewUtil {
     public static void LoginERPTask(String url, String master, String username,
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
-//        url = url + "mobile/login.action";
-        url ="http://192.168.253.29:8080/ERP/mobile/login.action";
+       url = url + "mobile/login.action";
+       // url ="http://192.168.253.29:8080/ERP/mobile/login.action";
         Map<String, String> params = new HashMap<String, String>();
         params.put("username", username);
         params.put("password", password);

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -94,9 +94,8 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-//        return baseUrl;
-        return "http://192.168.253.29:8080/ERP/";
-
+        return baseUrl;
+//        return "http://192.168.253.29:8080/ERP/";
     }
 
     /**

app_modular/appbooking/build.gradle

@@ -22,11 +22,8 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile deps.appcompatV7
     testCompile deps.junit
-
     compile project(':common')
     compile project(':appcontact')
- 
-
     compile 'com.android.support.constraint:constraint-layout:+'
     compile project(path: ':apputils')
 }