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

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -480,6 +480,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
                     showToact(R.string.networks_out);
                     return;
                 }
+                if (DialogUtils.isDialogShowing(ViewUtil.popupWindow)){
+                    ViewUtil.popupWindow.dismiss();
+                }
                 if (DialogUtils.isDialogShowing(popupWindow)){
                     popupWindow.dismiss();
                 }

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 24 10:05:14 CST 2018
-debugName=366
+#Thu May 24 11:47:28 CST 2018
+debugName=367
 versionName=630
-debugCode=366
+debugCode=367
 versionCode=170

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

@@ -94,7 +94,6 @@ public class ViewUtil {
 
     public static void ToastMessage(Context cont, String msg) {
         ToastUtil.showToast(cont,msg);
-
     }
 
 
@@ -322,7 +321,7 @@ public class ViewUtil {
                             if (mdProcessDialog != null) {
                                 mdProcessDialog.dismiss();
                             }
-                            ToastUtil.showToast(ct, errorMsg);
+                            ToastMessage(MyApplication.getInstance(),errorMsg);
                         } else {
                             String loginToken = JSONUtil.getText(resultObject, "token");
                             CommonUtil.setSharedPreferences(ct, Constants.CACHE.ACCOUNT_CENTER_TOKEN, loginToken);
@@ -331,7 +330,7 @@ public class ViewUtil {
                                 String accounts = JSON.toJSONString(accountArray);
                                 LoginSucess(accounts, user_phone, user_password);
                             } else {
-                                ToastUtil.showToast(ct, "企业列表为空");
+                                ToastMessage(MyApplication.getInstance(),"企业列表为空");
                             }
                         }
                     }
@@ -342,7 +341,7 @@ public class ViewUtil {
                         if (mdProcessDialog != null) {
                             mdProcessDialog.dismiss();
                         }
-                        ToastUtil.showToast(ct, failStr);
+                        ToastMessage(MyApplication.getInstance(),failStr);
                     }
                 });
     }
@@ -1191,19 +1190,8 @@ public class ViewUtil {
     }
 
     // 登录ERP
-    public static void LoginERPTask(String url, String enuu, String master, String username,
-                                    String password) {
+    public static void LoginERPTask(String url, String enuu, String master, String username, String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
-//        url = url + "mobile/login.action";
-//        url = CommonUtil.getAppBaseUrl(MyApplication.getInstance()) + "mobile/login.action";
-//        Map<String, String> params = new HashMap<String, String>();
-//        params.put("username", username);
-//        params.put("password", password);
-//        params.put("master", master);
-//        LogUtil.i("login", "url=" + url);
-//        LogUtil.i("login", "params=" + JSONUtil.map2JSON(params));
-//        startNetThread(url, params, handler, Constants.SUCCESS_ERP, null, null, "post");
-//
         String loginToken = CommonUtil.getSharedPreferences(ct, Constants.CACHE.ACCOUNT_CENTER_TOKEN);
         HttpRequest.getInstance().sendRequest(url,
                 new HttpParams.Builder()

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -333,6 +333,12 @@ public class BBookingAddActivity extends SupportToolBarActivity implements View.
             bt_commit.setEnabled(true);
             return;
         }
+
+        if (StringUtil.isEmpty(tv_book_topic.getText().toString())) {
+            ToastMessage("请选择预约主题！");
+            bt_commit.setEnabled(true);
+            return;
+        }
         //前面四个值是连带出来的
         String map = "{" +
                 "\"ab_bman\":\"" + tvBookObject.getText().toString() + "\"," +