合并分支，在个别情况下出现网络连接失败的问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -21,9 +21,7 @@ import android.widget.TextView;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
-import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
-import com.common.preferences.RedSpUtil;
 import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
@@ -170,7 +168,6 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 
 	private void initView() {
 		presenter = new MessagePresenter(mContext, this, unReaderListener);
-		initHeaderView();
 		pullScrollView.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
 		mAdapter = new MessageAdapter(null, mContext);
 		contentLV.setAdapter(mAdapter);
@@ -199,12 +196,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 		}
 
 	}
-
-	private void showRv(String key, Object foodRv) {
-		if (foodRv != null && !StringUtil.isEmpty(key) && foodRv instanceof View) {
-			((View) foodRv).setVisibility(RedSpUtil.api().getBoolean(key, false) ? View.GONE : View.VISIBLE);
-		}
-	}
+	
 
 	private void showPopupWindow() {
 		if (setWindow == null) initPopupWindow();

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

@@ -83,9 +83,12 @@ public class OAHttpHelper extends Handler {
     public void requestHttp(Request request, OnHttpResultListener listener) {
         if (request == null) new NullPointerException("Request is null");
         try {
-            if (getApiModel() instanceof ApiPlatform)
-                loadB2B(request, listener);
-            else loadERP(request, listener);
+	        String role = CommonUtil.getUserRole();
+	        if (role.equals(3)) {
+		        loadB2B(request, listener);
+	        } else if (role.equals("2")) {
+		        loadERP(request, listener);
+	        }
         } catch (Exception e) {
             if (e != null)
                 LogUtil.d(e.getMessage());

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -961,99 +961,16 @@ public class MessagePresenter implements OnHttpResultListener {
 	public List<MessageHeader> getHeaderModels() {
 		List<MessageHeader> models = new ArrayList<>();
 		MessageHeader model = null;
-
-		if (CommonUtil.getUserRole().equals("1")) {//个人用户
-			model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
-			model.setIcon(R.drawable.icon_yuyue3);
-			model.setSubDoc("");
-			model.setRedKey(Constants.MESSAGE_YUYUE);
-			model.setType(2);
-			model.setTag("");
-			models.add(model);
-
-			model = new MessageHeader("餐饮");
-			model.setIcon(R.drawable.icon_food);
-			model.setSubDoc("美味齐全");
-			model.setRedKey(Constants.MESSAGE_FOOD);
-			model.setType(1);
-			model.setTag("10003");
-			models.add(model);
-
-			model = new MessageHeader("美容美发");
-			model.setIcon(R.drawable.icon_hair);
-			model.setSubDoc("时尚潮流");
-			model.setRedKey(Constants.MESSAGE_HAIR);
-			model.setType(1);
-			model.setTag("10004");
-			models.add(model);
-
-			model = new MessageHeader("KTV");
-			model.setIcon(R.drawable.icon_ktv);
-			model.setSubDoc("音乐节");
-			model.setRedKey(Constants.MESSAGE_KTV);
-			model.setType(1);
-			model.setTag("10006");
-			models.add(model);
-
-			model = new MessageHeader("运动健身");
-			model.setIcon(R.drawable.icon_sport);
-			model.setSubDoc("hi起来");
-			model.setRedKey(Constants.MESSAGE_SPORT);
-			model.setType(1);
-			model.setTag("10002");
-			models.add(model);
-
-			model = new MessageHeader("会所");
-			model.setIcon(R.drawable.icon_club);
-			model.setSubDoc("预约有优惠");
-			model.setRedKey(Constants.MESSAGE_CLUB);
-			model.setType(1);
-			model.setTag("10005");
-			models.add(model);
-
-			model = new MessageHeader("医院挂号");
-			model.setIcon(R.drawable.icon_hospital);
-			model.setSubDoc("您的健康助手");
-			model.setRedKey(Constants.MESSAGE_HOSPITAL);
-			model.setType(1);
-			model.setTag("10001");
-			models.add(model);
+		String role = CommonUtil.getUserRole();
+		LogUtil.i("role=" + role);
+		if (role.equals("1")) {//个人用户
+			models.addAll(getPersonalHeader());
+		} else if (role.equals("3")) {//b2b用户
+			models.addAll(getB2bHeader());
 		} else {
-			model = new MessageHeader(StringUtil.getMessage(R.string.msg_approval));
-			model.setIcon(R.drawable.home_image_01_u);
-			model.setSubDoc("");
-			model.setRedKey("");
-			model.setType(4);
-			model.setTag("");
-			models.add(model);
-
-			model = new MessageHeader(StringUtil.getMessage(R.string.msg_work));
-			model.setIcon(R.drawable.daibangongzuo);
-			model.setSubDoc("");
-			model.setRedKey("");
-			model.setType(5);
-			model.setTag("");
-			models.add(model);
-
-			model = new MessageHeader(StringUtil.getMessage(R.string.msg_subscribe));
-			model.setIcon(R.drawable.tingyue);
-			model.setSubDoc("");
-			model.setRedKey(Constants.MESSAGE_DINGYUE);
-			model.setRedMessage(StringUtil.getMessage(R.string.msg_subscribe_data));
-			model.setType(6);
-			model.setTag("");
-			models.add(model);
-
-
-			model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
-			model.setIcon(R.drawable.icon_yuyue3);
-			model.setSubDoc("");
-			model.setRedKey(Constants.MESSAGE_YUYUE);
-			model.setType(2);
-			model.setTag("");
-			models.add(model);
+			models.addAll(getErpHeader());
 		}
-		if (PreferenceUtils.getInt("UUSTEP", -1) == 1 && !CommonUtil.isReleaseVersion()) {
+		if (PreferenceUtils.getInt("UUSTEP", -1) == 1) {
 			//显示UU运动
 			model = new MessageHeader(StringUtil.getMessage(R.string.set_sport));
 			model.setIcon(R.drawable.uu_run);
@@ -1066,6 +983,108 @@ public class MessagePresenter implements OnHttpResultListener {
 		return models;
 	}
 
+	private List<MessageHeader> getErpHeader() {
+		List<MessageHeader> models = new ArrayList<>();
+		MessageHeader model = new MessageHeader(StringUtil.getMessage(R.string.msg_approval));
+		model.setIcon(R.drawable.home_image_01_u);
+		model.setSubDoc("");
+		model.setRedKey("");
+		model.setType(4);
+		model.setTag("");
+		models.add(model);
+
+		model = new MessageHeader(StringUtil.getMessage(R.string.msg_work));
+		model.setIcon(R.drawable.daibangongzuo);
+		model.setSubDoc("");
+		model.setRedKey("");
+		model.setType(5);
+		model.setTag("");
+		models.add(model);
+
+		model = new MessageHeader(StringUtil.getMessage(R.string.msg_subscribe));
+		model.setIcon(R.drawable.tingyue);
+		model.setSubDoc("");
+		model.setRedKey(Constants.MESSAGE_DINGYUE);
+		model.setRedMessage(StringUtil.getMessage(R.string.msg_subscribe_data));
+		model.setType(6);
+		model.setTag("");
+		models.add(model);
+
+
+		model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
+		model.setIcon(R.drawable.icon_yuyue3);
+		model.setSubDoc("");
+		model.setRedKey(Constants.MESSAGE_YUYUE);
+		model.setType(2);
+		model.setTag("");
+		models.add(model);
+		return models;
+	}
+
+	private List<MessageHeader> getB2bHeader() {
+		return getPersonalHeader();
+	}
+
+	private List<MessageHeader> getPersonalHeader() {
+		List<MessageHeader> models = new ArrayList<>();
+		MessageHeader model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
+		model.setIcon(R.drawable.icon_yuyue3);
+		model.setSubDoc("");
+		model.setRedKey(Constants.MESSAGE_YUYUE);
+		model.setType(2);
+		model.setTag("");
+		models.add(model);
+
+		model = new MessageHeader("餐饮");
+		model.setIcon(R.drawable.icon_food);
+		model.setSubDoc("美味齐全");
+		model.setRedKey(Constants.MESSAGE_FOOD);
+		model.setType(1);
+		model.setTag("10003");
+		models.add(model);
+
+		model = new MessageHeader("美容美发");
+		model.setIcon(R.drawable.icon_hair);
+		model.setSubDoc("时尚潮流");
+		model.setRedKey(Constants.MESSAGE_HAIR);
+		model.setType(1);
+		model.setTag("10004");
+		models.add(model);
+
+		model = new MessageHeader("KTV");
+		model.setIcon(R.drawable.icon_ktv);
+		model.setSubDoc("音乐节");
+		model.setRedKey(Constants.MESSAGE_KTV);
+		model.setType(1);
+		model.setTag("10006");
+		models.add(model);
+
+		model = new MessageHeader("运动健身");
+		model.setIcon(R.drawable.icon_sport);
+		model.setSubDoc("hi起来");
+		model.setRedKey(Constants.MESSAGE_SPORT);
+		model.setType(1);
+		model.setTag("10002");
+		models.add(model);
+
+		model = new MessageHeader("会所");
+		model.setIcon(R.drawable.icon_club);
+		model.setSubDoc("预约有优惠");
+		model.setRedKey(Constants.MESSAGE_CLUB);
+		model.setType(1);
+		model.setTag("10005");
+		models.add(model);
+
+		model = new MessageHeader("医院挂号");
+		model.setIcon(R.drawable.icon_hospital);
+		model.setSubDoc("您的健康助手");
+		model.setRedKey(Constants.MESSAGE_HOSPITAL);
+		model.setType(1);
+		model.setTag("10001");
+		models.add(model);
+		return models;
+	}
+
 
 	public void turn2ActByHeader(Activity ct, MessageHeader model) {
 		Intent intent = null;