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

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

@@ -120,7 +120,6 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 	@Override
 	public void onResume() {
 		super.onResume();
-		initHeaderView();
 		presenter.loadData();
 	}
 
@@ -167,35 +166,13 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 
 
 	private void initView() {
-		presenter = new MessagePresenter(mContext, this, unReaderListener);
 		pullScrollView.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
 		mAdapter = new MessageAdapter(null, mContext);
 		contentLV.setAdapter(mAdapter);
+		presenter = new MessagePresenter(mContext, this, unReaderListener);
 	}
 
-	private void initHeaderView() {
-		if (headAdapter == null) {
-			headAdapter = new HeadAdapter(presenter.getHeaderModels());
-			headerLV.setAdapter(headAdapter);
-			headerLV.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-				@Override
-				public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-					MessageHeader model = headAdapter.getItemModel(position);
-					if (model != null) {
-						if (!model.isHideRed()) {//如果没有被隐藏，需要更新
-							model.hideRed();
-							headAdapter.notifyDataSetChanged();
-						}
-						presenter.turn2ActByHeader((Activity) ct, model);
-					}
-
-				}
-			});
-		} else {
-			headAdapter.setModels(presenter.getHeaderModels());
-		}
 
-	}
 	
 
 	private void showPopupWindow() {
@@ -348,6 +325,30 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 		}
 	}
 
+	@Override
+	public void updateHeader(List<MessageHeader> models) {
+		if (headAdapter == null) {
+			headAdapter = new HeadAdapter(models);
+			headerLV.setAdapter(headAdapter);
+			headerLV.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+				@Override
+				public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+					MessageHeader model = headAdapter.getItemModel(position);
+					if (model != null) {
+						if (!model.isHideRed()) {//如果没有被隐藏，需要更新
+							model.hideRed();
+							headAdapter.notifyDataSetChanged();
+						}
+						presenter.turn2ActByHeader((Activity) ct, model);
+					}
+
+				}
+			});
+		} else {
+			headAdapter.setModels(models);
+		}
+	}
+
 
 	private class HeadAdapter extends BaseAdapter {
 		List<MessageHeader> models;

app_core/common/src/main/java/com/core/dao/UUHelperDao.java

@@ -17,116 +17,116 @@ import java.util.List;
  */
 
 public class UUHelperDao extends Dao<UUHelperModel> {
-    private static UUHelperDao instance;
-
-    public static UUHelperDao getInstance() {
-        UUHelperDao inst = instance;
-        if (inst == null) {
-            synchronized (UUHelperDao.class) {
-                inst = instance;
-                if (inst == null) {
-                    inst = new UUHelperDao();
-                    instance = inst;
-                }
-            }
-        }
-        return inst;
-    }
-
-    private UUHelperDao() {
-
-    }
-
-    @Override
-    protected String getTable() {
-        return DatabaseTables.UUHelperTable.NAME;
-    }
-
-    @Override
-    protected ContentValues getValues(UUHelperModel model) throws Exception {
-        ContentValues values = new ContentValues();
-        values.put(DatabaseTables.UUHelperTable.Cols.TIME_SEND, model.getTimeSend());
-        values.put(DatabaseTables.UUHelperTable.Cols.USER_ID, MyApplication.getInstance().getLoginUserId());
-        values.put(DatabaseTables.UUHelperTable.Cols.IMAGE_URL, model.getImageUrl());
-        values.put(DatabaseTables.UUHelperTable.Cols.ICON_URL, model.getIconUrl());
-        values.put(DatabaseTables.UUHelperTable.Cols.LINK_URL, model.getLinkUrl());
-        values.put(DatabaseTables.UUHelperTable.Cols.CONTENT, model.getContent());
-        values.put(DatabaseTables.UUHelperTable.Cols.READED, model.isReaded());
-        values.put(DatabaseTables.UUHelperTable.Cols.DATE, model.getDate());
-        values.put(DatabaseTables.UUHelperTable.Cols.TITLE, model.getTitle());
-        values.put(DatabaseTables.UUHelperTable.Cols.TYPE, model.getType());
-        return values;
-    }
-
-    @Override
-    protected UUHelperModel getData(Cursor c) throws Exception {
-        int _id = c.getInt(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.ID));
-        long timeSend = c.getLong(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.TIME_SEND));
-        String imageUrl = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.IMAGE_URL));
-        String iconUrl = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.ICON_URL));
-        String linkUrl = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.LINK_URL));
-        String content = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.CONTENT));
-        String date = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.DATE));
-        String title = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.TITLE));
-        int type = c.getInt(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.TYPE));
-        boolean readed = c.getInt(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.READED)) > 0;
-        return new UUHelperModel(timeSend, date, type)
-                .setId(_id)
-                .setIconUrl(iconUrl)
-                .setImageUrl(imageUrl)
-                .setLinkUrl(linkUrl)
-                .setContent(content)
-                .setTitle(title)
-                .setReaded(readed);
-    }
-
-
-    public boolean saveData(UUHelperModel uuHelperItem) {
-        return insert(uuHelperItem, null, null);
-    }
-
-    public List<UUHelperModel> getAllModels() {
-        String orderBy = DatabaseTables.UUHelperTable.Cols.DATE + " asc";
-        String where = DatabaseTables.UUHelperTable.Cols.USER_ID + " =?";
-        String[] whereArgs = {MyApplication.getInstance().getLoginUserId()};
-        return query(null, where, whereArgs, orderBy);
-    }
-
-    public boolean deleteData(int id) {
-        if (id == -1) {
-            return clear();
-        } else {
-            return delete("id=?", new String[]{String.valueOf(id)});
-        }
-    }
-
-    public boolean updateRead(int id) {
-        long i = 0;
-        try {
-            String where = DatabaseTables.UUHelperTable.Cols.ID + " =?";
-            String[] whereArgs = {String.valueOf(id)};
-            SQLiteDatabase db = DatabaseManager.getInstance().openDatabase();
-            ContentValues values = new ContentValues();
-            values.put(DatabaseTables.UUHelperTable.Cols.READED, 1);
-            i = db.update(getTable(), values, where, whereArgs);
-        } finally {
-            DatabaseManager.getInstance().closeDatabase();
-            return i > 0;
-        }
-    }
-
-    public boolean updateRead() {
-        long i = 0;
-        try {
-            String where = null;
-            String[] whereArgs = null;
-            SQLiteDatabase db = DatabaseManager.getInstance().openDatabase();
-            ContentValues values = new ContentValues();
-            values.put(DatabaseTables.UUHelperTable.Cols.READED, 1);
-            i = db.update(getTable(), values, where, whereArgs);
-        } finally {
-            DatabaseManager.getInstance().closeDatabase();
-            return i > 0;
-        }
-    }
+	private static UUHelperDao instance;
+
+	public static UUHelperDao getInstance() {
+		UUHelperDao inst = instance;
+		if (inst == null) {
+			synchronized (UUHelperDao.class) {
+				inst = instance;
+				if (inst == null) {
+					inst = new UUHelperDao();
+					instance = inst;
+				}
+			}
+		}
+		return inst;
+	}
+
+	private UUHelperDao() {
+
+	}
+
+	@Override
+	protected String getTable() {
+		return DatabaseTables.UUHelperTable.NAME;
+	}
+
+	@Override
+	protected ContentValues getValues(UUHelperModel model) throws Exception {
+		ContentValues values = new ContentValues();
+		values.put(DatabaseTables.UUHelperTable.Cols.TIME_SEND, model.getTimeSend());
+		values.put(DatabaseTables.UUHelperTable.Cols.USER_ID, MyApplication.getInstance().getLoginUserId());
+		values.put(DatabaseTables.UUHelperTable.Cols.IMAGE_URL, model.getImageUrl());
+		values.put(DatabaseTables.UUHelperTable.Cols.ICON_URL, model.getIconUrl());
+		values.put(DatabaseTables.UUHelperTable.Cols.LINK_URL, model.getLinkUrl());
+		values.put(DatabaseTables.UUHelperTable.Cols.CONTENT, model.getContent());
+		values.put(DatabaseTables.UUHelperTable.Cols.READED, model.isReaded());
+		values.put(DatabaseTables.UUHelperTable.Cols.DATE, model.getDate());
+		values.put(DatabaseTables.UUHelperTable.Cols.TITLE, model.getTitle());
+		values.put(DatabaseTables.UUHelperTable.Cols.TYPE, model.getType());
+		return values;
+	}
+
+	@Override
+	protected UUHelperModel getData(Cursor c) throws Exception {
+		int _id = c.getInt(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.ID));
+		long timeSend = c.getLong(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.TIME_SEND));
+		String imageUrl = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.IMAGE_URL));
+		String iconUrl = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.ICON_URL));
+		String linkUrl = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.LINK_URL));
+		String content = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.CONTENT));
+		String date = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.DATE));
+		String title = c.getString(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.TITLE));
+		int type = c.getInt(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.TYPE));
+		boolean readed = c.getInt(c.getColumnIndex(DatabaseTables.UUHelperTable.Cols.READED)) > 0;
+		return new UUHelperModel(timeSend, date, type)
+				.setId(_id)
+				.setIconUrl(iconUrl)
+				.setImageUrl(imageUrl)
+				.setLinkUrl(linkUrl)
+				.setContent(content)
+				.setTitle(title)
+				.setReaded(readed);
+	}
+
+
+	public boolean saveData(UUHelperModel uuHelperItem) {
+		return insert(uuHelperItem, null, null);
+	}
+
+	public List<UUHelperModel> getAllModels() {
+		String orderBy = DatabaseTables.UUHelperTable.Cols.DATE + " asc";
+		String where = DatabaseTables.UUHelperTable.Cols.USER_ID + " =?";
+		String[] whereArgs = {MyApplication.getInstance().getLoginUserId()};
+		return query(null, where, whereArgs, orderBy);
+	}
+
+	public boolean deleteData(int id) {
+		if (id == -1) {
+			return clear();
+		} else {
+			return delete("id=?", new String[]{String.valueOf(id)});
+		}
+	}
+
+	public boolean updateRead(int id) {
+		long i = 0;
+		try {
+			String where = DatabaseTables.UUHelperTable.Cols.ID + " =?";
+			String[] whereArgs = {String.valueOf(id)};
+			SQLiteDatabase db = DatabaseManager.getInstance().openDatabase();
+			ContentValues values = new ContentValues();
+			values.put(DatabaseTables.UUHelperTable.Cols.READED, 1);
+			i = db.update(getTable(), values, where, whereArgs);
+		} finally {
+			DatabaseManager.getInstance().closeDatabase();
+			return i > 0;
+		}
+	}
+
+	public boolean updateRead(boolean readed) {
+		long i = 0;
+		try {
+			String where = null;
+			String[] whereArgs = null;
+			SQLiteDatabase db = DatabaseManager.getInstance().openDatabase();
+			ContentValues values = new ContentValues();
+			values.put(DatabaseTables.UUHelperTable.Cols.READED, readed ? 1 : 0);
+			i = db.update(getTable(), values, where, whereArgs);
+		} finally {
+			DatabaseManager.getInstance().closeDatabase();
+			return i > 0;
+		}
+	}
 }

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -946,4 +946,4 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             }));
         }
     }
-}
+}

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

@@ -94,7 +94,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     private static final int REQUEST_CODE_PICK_PHOTO = 2;//单选照片
     private String photoselect=null;
     private ProgressDialog mProgressDialog;
-
+    private Boolean updateChangeP = false; //更新是否更换了头像，若没换
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -339,6 +339,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                     photoselect = mNewPhotoUri.getPath();
                     ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(),image_im);
                     Log.i("files0x01",photoselect);
+                    updateChangeP = true;
                 } else {
                     ToastUtil.showToast(this, com.uas.appworks.R.string.c_take_picture_failed);
                 }
@@ -350,6 +351,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                     image_im.setImageURI(Uri.fromFile(new File(photoselect)));
 //                    ImageLoader.getInstance().displayImage(photoselect,image_im);
                     Log.i("files0x01",photoselect);
+                    updateChangeP = true;
                 }
             }
         }
@@ -357,10 +359,19 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
     private void saveJudge() {
         File file=  new File(photoselect);
-        if (!file.exists()) {// 文件不存在
-            ToastMessage("请添加头像照片");
-            return;
-        }
+        if (StringUtil.isEmpty(result)){
+            if (!file.exists()) {// 录入时的，且图片文件不存在
+                ToastMessage("请添加头像照片");
+                return;
+            } else {
+                doSave();
+            }
+        }else
+            doSave();
+
+    }
+
+    private void doSave() {
         if (mUserNameTv.testValidity() && mUserSexTv.testValidity()
                 && mUserTelTv.testValidity()){
             if (!StringUtil.isEmpty(mUserEmailTv.getText().toString())) {
@@ -371,7 +382,6 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                 }
             }else
                 saveRequest();
-
         }
     }
 
@@ -418,9 +428,13 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                         if (o.toString().contains("imid")){
                             String imid = JSON.parseObject(o.toString()).getString("imid");
                             if (StringUtil.isEmpty(imid)) return;
-                            unLoadHeader(imid);
+                            if (updateChangeP) {  //更换过照片
+                                unLoadHeader(imid);
+                            }else {
+                                beforeSendMsg();  //只有在更新操作时且没换头像走这里
+                            }
                         }else
-                            jumpTo();
+                            beforeSendMsg();
 
                     }else
                         ToastMessage(getString(R.string.save_failed));
@@ -485,14 +499,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                 ProgressDialogUtil.dismiss(mProgressDialog);
                 if (success) {
                     ToastUtil.showToast(PersonSettingActivity.this, R.string.upload_avatar_success);
-                    String name = CommonUtil.getName();
-                    String phone = mUserTelTv.getText().toString().trim().replaceAll(" ", "");
-                    String modeid1 = "0398e112-97a3-40b0-8430-0e871ef22524";
-
-                    String modeid2 = "fd4ac30e-b176-4410-ac0e-e39c8b71dfe0";
-
-                    sendMessages(modeid1,name,phone);
-                    sendMessages(modeid2,name,phone);
+                    beforeSendMsg();
 
                 } else {
                     ToastUtil.showToast(PersonSettingActivity.this, R.string.upload_avatar_failed);
@@ -508,6 +515,17 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         });
     }
 
+    private void beforeSendMsg() {
+        String name = CommonUtil.getName();
+        String phone = mUserTelTv.getText().toString().trim().replaceAll(" ", "");
+        String modeid1 = "0398e112-97a3-40b0-8430-0e871ef22524";
+
+        String modeid2 = "fd4ac30e-b176-4410-ac0e-e39c8b71dfe0";
+
+        sendMessages(modeid1,name,phone);
+        sendMessages(modeid2,name,phone);
+    }
+
     private void sendMessages( final String modeid, final String name, final String phone) {
         StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
                 Request.Method.POST, "http://message.ubtob.com/sms/send", new Response.ErrorListener() {
@@ -587,6 +605,4 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         }
         return super.onOptionsItemSelected(item);
     }
-
-
 }

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/ApprovalAdapter.java

@@ -161,7 +161,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         int textColor = R.color.hintColor;
         int reId = R.drawable.weishenpi;
         if (!StringUtil.isEmpty(approval.getIdKey())) {
-            holder.valuesTv.setText(approval.getIdKey());
+            holder.valuesTv.setText(approval.getIdKey().replace("\\n","\n"));
             if (approval.getIdKey().startsWith("待审批")) {
                 textColor = R.color.approvaling;
                 reId = R.drawable.daishenpi;
@@ -292,7 +292,6 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         final CustomProgressDialog progressDialog = CustomProgressDialog.createDialog(ct);
         progressDialog.setTitile("正在下载");
         progressDialog.setMessage("正在下载，请勿关闭程序");
-        LogUtil.i("gotoReadEnclosure");
         if (!StringUtil.isEmpty(approval.getCaption())) {
             if (isImage(approval.getCaption())) {
                 Intent intent = new Intent("com.modular.tool.SingleImagePreviewActivity");
@@ -304,7 +303,6 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     public void onLoadIng(int progress, int allProgress) {
                         if (progressDialog != null)
                             progressDialog.show();
-                        LogUtil.i("TODO 下载进行中回调");
                     }
 
                     @Override
@@ -379,7 +377,6 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             if (isWeb(approval.getValues())) {
                 setViewShowAble(true, holder.valueWeb);
                 setViewShowAble(false, holder.valueEt, holder.valueTv);
-                LogUtil.i(approval.getValues());
                 holder.valueWeb.loadDataWithBaseURL(null, approval.getValues(), "text/html", "utf-8", null);
             } else {
                 setViewShowAble(true, holder.valueTv);
@@ -392,7 +389,8 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     if (approval.isNumber()) {
                         holder.valueTv.setText(approval.getNumber());
                     } else {
-                        holder.valueTv.setText(Html.fromHtml(approval.getValues()));
+                        LogUtil.i("bindBaseRVView="+approval.getValues());
+                        holder.valueTv.setText(Html.fromHtml(approval.getValues().replace("\n","<br />")));
                     }
                 }
             }
@@ -415,7 +413,6 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             @Override
             public void onDatePicked(String year, String month, String day) {
                 String time = year + "-" + month + "-" + day;
-                LogUtil.i("time=" + time);
                 showView.setText(time);
                 approvals.get(position).setValues(time);
             }

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

@@ -97,12 +97,14 @@ public class MessagePresenter implements OnHttpResultListener {
 		public void onReceive(Context context, Intent intent) {
 			String action = intent.getAction();
 			if (StringUtil.isEmpty(action)) return;
+			LogUtil.i("MessagePresenter=" + action);
 			if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
 				iMessageView.changeNet(SystemUtil.isNetWorkConnected(MyApplication.getInstance()));
 			} else if (OAConfig.AUTO_SIGIN_ALART.equals(action)) {
 				loadNews(isB2b);//获取消息
 			} else if (action.equals("com.app.home.update") || action.equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)
 					|| action.equals(MsgBroadcast.ACTION_MSG_UI_UPDATE)) {
+				initHeaderModels();
 				loadData();
 			}
 		}
@@ -123,6 +125,7 @@ public class MessagePresenter implements OnHttpResultListener {
 				dateFilter.addAction(f);
 			LocalBroadcastManager.getInstance(ct).registerReceiver(dataChangeReceiver, dateFilter);
 		}
+		initHeaderModels();
 	}
 
 	public void loadData() {
@@ -317,7 +320,7 @@ public class MessagePresenter implements OnHttpResultListener {
 				bookingNum = Integer.valueOf(object.getString("count"));
 				iMessageView.updateHeaderView(2, Integer.valueOf(object.getString("count")), "", "");
 				updateForUnReader();
-				iMessageView.showModel(null);
+//				iMessageView.showModel(null);  ///tODO 这个引起了闪一下的问题(可能存在会有刷新不过来的问题)
 				if (bundle != null) {
 					String role = bundle.getString("role");
 					if (role != null && role.equals("1")) {
@@ -773,7 +776,28 @@ public class MessagePresenter implements OnHttpResultListener {
 //            MessageDao.getInstance().upStatusByType(friend.getDescription(), true);
 //            loadData();
 		} else if (friend.getType() == XmppMessage.TYPE_UUHELPER) {
-			UUHelperDao.getInstance().updateRead();
+			UUHelperDao.getInstance().updateRead(true);
+		} else {
+			if (friend.getUnReadNum() > 0) {
+				MsgBroadcast.broadcastMsgNumUpdate(ct, false, friend.getUnReadNum());
+				friend.setUnReadNum(0);
+				iMessageView.showModel(mFriendList);
+			}
+		}
+	}
+
+	/**
+	 * 设置未阅读该类型文件
+	 *
+	 * @param position
+	 */
+	public void unReaderAllByType(int position) {
+		if (ListUtils.isEmpty(mFriendList) || mFriendList.size() < position) return;
+		Friend friend = mFriendList.get(position).getBean();
+		if (friend.getType() == XmppMessage.TYPE_ERP) {
+			MessageDao.getInstance().upStatusByType(friend.getDescription(), false);
+		} else if (friend.getType() == XmppMessage.TYPE_UUHELPER) {
+			UUHelperDao.getInstance().updateRead(false);
 		} else {
 			if (friend.getUnReadNum() > 0) {
 				MsgBroadcast.broadcastMsgNumUpdate(ct, false, friend.getUnReadNum());
@@ -871,7 +895,7 @@ public class MessagePresenter implements OnHttpResultListener {
 			return;
 		} else if (friend.getType() == XmppMessage.TYPE_UUHELPER) {
 			ct.startActivity(new Intent(ct, UUHelperActivity.class));
-			UUHelperDao.getInstance().updateRead();
+			UUHelperDao.getInstance().updateRead(true);
 			return;
 		}
 		if (friend.getRoomFlag() == 0) {
@@ -953,7 +977,7 @@ public class MessagePresenter implements OnHttpResultListener {
 	}
 
 
-	public List<MessageHeader> getHeaderModels() {
+	private void initHeaderModels() {
 		List<MessageHeader> models = new ArrayList<>();
 		MessageHeader model = null;
 		String role = CommonUtil.getUserRole();
@@ -975,7 +999,7 @@ public class MessagePresenter implements OnHttpResultListener {
 			model.setTag("");
 			models.add(model);
 		}
-		return models;
+		iMessageView.updateHeader(models);
 	}
 
 	private List<MessageHeader> getErpHeader() {

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/imp/IMessageView.java

@@ -2,6 +2,7 @@ package com.modular.appmessages.presenter.imp;
 
 import com.core.model.Friend;
 import com.core.utils.sortlist.BaseSortModel;
+import com.modular.appmessages.model.MessageHeader;
 
 import java.util.List;
 
@@ -18,4 +19,6 @@ public interface IMessageView  {
     void updateHeaderView(int type, int num, String subTitle,String time);
 
     void changeNet(boolean workConnected);
+
+    void updateHeader(List<MessageHeader> models);
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -215,10 +215,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 		Map<String, Object> param = new HashMap<>();
 		Map<String, Object> formStore = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
-		String name = CommonUtil.getSharedPreferences(ct, "erp_emname");
-		if (StringUtil.isEmpty(name)) {
-			name = MyApplication.getInstance().mLoginUser.getNickName();
-		}
+		String name = CommonUtil.getName();
 		/***formStore***/
 		if (!isB2b) {
 			formStore.put("mp_id", id);//请求的id MOBILE_OUTPLAN_SEQ

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/approvautils/NodeAdapter.java

@@ -75,7 +75,7 @@ public class NodeAdapter extends BaseAdapter {
         }
         int textColor = R.color.hintColor;
         if (!StringUtil.isEmpty(approval.getIdKey())) {
-            holder.valuesTv.setText(approval.getIdKey());
+            holder.valuesTv.setText(approval.getIdKey().replace("\\n","\n"));
             if (approval.getIdKey().startsWith("待审批")) {
                 textColor = R.color.approvaling;
             } else if (approval.getIdKey().startsWith("未通过")) {