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

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

@@ -22,7 +22,6 @@ import com.common.preferences.PreferenceUtils;
 import com.common.system.SystemUtil;
 import com.common.thread.ThreadUtil;
 import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConstant;
 import com.core.app.Constants;
@@ -127,34 +126,22 @@ public class MessagePresenter implements OnHttpResultListener {
 	}
 
 	public void loadData() {
-		isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
-		if (isB2b) {
-			if ("1".equals(com.core.utils.CommonUtil.getUserRole())) {
-				//个人用户
-				loadBookingNewNum();//预约红点接口
-				saveErp2DB(null);
-			} else {
-				loadB2bNewsCount();
-			}
-
-		} else {
+		String role = CommonUtil.getUserRole();
+		isB2b = false;
+		if (role.equals("2")) {//Erp用户
 			SUB_READ_TIME = CommonUtil.getMaster() + "SUB_READ_TIME";//订阅好点击阅读时间
 			subReadTime = PreferenceUtils.getString(SUB_READ_TIME);
-			if ("1".equals(com.core.utils.CommonUtil.getUserRole())) {
-				//个人用户
-				LogUtil.d("roamer", "个人用户消息加载！");
-				loadBookingNewNum();//预约红点接口
-
-			} else {
-				loadTaskData();//获取任务接口
-				loadProcessToDo();//获取审批流接口
-				loadSubData();
-				loadBookingNewNum();//预约红点接口
-
-			}
+			loadTaskData();//获取任务接口
+			loadProcessToDo();//获取审批流接口
+			loadSubData();
+			loadNews(isB2b);//获取消息
+		} else if (role.equals("3")) {//B2b用户
+			isB2b = true;
+			loadB2bNewsCount();
 			loadNews(isB2b);//获取消息
-		}
 
+		}
+		loadBookingNewNum();//预约红点接口
 	}
 
 	private void loadB2bNewsCount() {
@@ -329,6 +316,7 @@ public class MessagePresenter implements OnHttpResultListener {
 				bookingNum = Integer.valueOf(object.getString("count"));
 				iMessageView.updateHeaderView(2, Integer.valueOf(object.getString("count")), "", "");
 				updateForUnReader();
+				iMessageView.showModel(null);
 				break;
 			case LOAD_EMNEWS:
 				if (!object.containsKey("listdata")) {