代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

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

@@ -671,6 +671,7 @@ public class ViewUtil {
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "spaceId", String.valueOf(entity.getSpaceId()));
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "companyName", String.valueOf(entity.getName()));
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "companyEnUu", String.valueOf(entity.getEnuu()));
+                                                CommonUtil.setSharedPreferences(MyApplication.getInstance(), "erp_uu", String.valueOf(entity.getEnuu()));
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "userRole", "3");
                                                 LoginB2BTask(phone, password, entity.getSpaceId());//登录B2B
                                             }

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -9,7 +9,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -1084,7 +1083,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             public void onResponse(ObjectResult<AddAttentionResult> result) {
               //  showToast("短信发送成功", R.color.load_submit);
                 //ToastUtil.showToast(MyApplication.getInstance(),"短信发送成功");
-                Toast.makeText(MyApplication.getInstance(),"短信发送成功",Toast.LENGTH_SHORT).show();
+             //   Toast.makeText(MyApplication.getInstance(),"短信发送成功",Toast.LENGTH_SHORT).show();
 
             }
         }, AddAttentionResult.class, null) {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -263,6 +263,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         }
 //        UserRoleUtils.checkUserRole(this,getRootView());
 
+        businessmen_setting_rl.setVisibility(View.GONE);
         doShowBSettingJudge();  //判断商家是不是管理员
     }
 
@@ -283,8 +284,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("appCompanyAdmin", o.toString()+"");
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
                 try {
                     //{"result":"1","url":"http://113.105.74.140:8081/u/0/0/201710/o/48fda5af663f40f795f2dd49e2d8801f.jpg"}
                     if (o.toString().contains("result")) {