Merge pull request yaphone#3 from yaphone/itchat4j-dev

准备处理好友列表

Author: yaphone

src/main/java/cn/zhouyafeng/itchat4j/components/Login.java

@@ -369,6 +369,7 @@ void startReceiving() {
 		new Thread(new Runnable() {
 			int retryCount = 0;
 
+			@Override
 			public void run() {
 				while (core.isAlive()) {
 					try {

src/main/java/cn/zhouyafeng/itchat4j/utils/Core.java

@@ -39,7 +39,7 @@ public static Core getInstance() {
 	List<JSONObject> memberList = storageClass.getMemberList();
 	List<JSONObject> mpList = storageClass.getMpList();
 	List<Object> chatroomList = storageClass.getChatroomList();
-	List<Object> msgList = storageClass.getMsgList();
+	List<JSONObject> msgList = storageClass.getMsgList();
 	Map<String, Object> loginInfo = new HashMap<String, Object>();
 	CloseableHttpClient httpClient = HttpClients.createDefault();
 	MyHttpClient myHttpClient = new MyHttpClient();
@@ -97,14 +97,6 @@ public void setChatroomList(List<Object> chatroomList) {
 		this.chatroomList = chatroomList;
 	}
 
-	public List<Object> getMsgList() {
-		return msgList;
-	}
-
-	public void setMsgList(List<Object> msgList) {
-		this.msgList = msgList;
-	}
-
 	public Map<String, Object> getLoginInfo() {
 		return loginInfo;
 	}
@@ -169,4 +161,12 @@ public void setMyHttpClient(MyHttpClient myHttpClient) {
 		this.myHttpClient = myHttpClient;
 	}
 
+	public List<JSONObject> getMsgList() {
+		return msgList;
+	}
+
+	public void setMsgList(List<JSONObject> msgList) {
+		this.msgList = msgList;
+	}
+
 }

src/main/java/cn/zhouyafeng/itchat4j/utils/Storage.java

@@ -36,7 +36,7 @@ public static Storage getInstance() {
 	private List<JSONObject> memberList = new ArrayList<JSONObject>();
 	private List<JSONObject> mpList = new ArrayList<JSONObject>();
 	private List<Object> chatroomList = new ArrayList<Object>();
-	private List<Object> msgList = new ArrayList<Object>();
+	private List<JSONObject> msgList = new ArrayList<JSONObject>(); // 消息列表
 	private String lastInputUserName;
 
 	public String getUserName() {
@@ -87,11 +87,11 @@ public void setChatroomList(List<Object> chatroomList) {
 		this.chatroomList = chatroomList;
 	}
 
-	public List<Object> getMsgList() {
+	public List<JSONObject> getMsgList() {
 		return msgList;
 	}
 
-	public void setMsgList(List<Object> msgList) {
+	public void setMsgList(List<JSONObject> msgList) {
 		this.msgList = msgList;
 	}
 

src/test/java/cn/zhouyafeng/itchat4j/demo/SimpleDemo.java

@@ -23,14 +23,12 @@ public class SimpleDemo implements IMsgHandlerFace {
 
 	@Override
 	public String textMsgHandle(JSONObject msg) {
-		System.out.println(msg);
 		String text = msg.getString("Text");
 		return text;
 	}
 
 	@Override
 	public String picMsgHandle(JSONObject msg) {
-		System.out.println(msg);
 		String fileName = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date());
 		String picPath = "D://itchat4j/pic" + File.separator + fileName + ".jpg";
 		DownloadTools.getDownloadFn(msg, MsgType.PIC, picPath);
@@ -39,7 +37,6 @@ public String picMsgHandle(JSONObject msg) {
 
 	@Override
 	public String voiceMsgHandle(JSONObject msg) {
-		System.out.println(msg);
 		String fileName = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date());
 		String voicePath = "D://itchat4j/voice" + File.separator + fileName + ".mp3";
 		DownloadTools.getDownloadFn(msg, MsgType.VOICE, voicePath);
@@ -48,7 +45,6 @@ public String voiceMsgHandle(JSONObject msg) {
 
 	@Override
 	public String viedoMsgHandle(JSONObject msg) {
-		System.out.println(msg);
 		String fileName = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date());
 		String viedoPath = "D://itchat4j/viedo" + File.separator + fileName + ".mp4";
 		DownloadTools.getDownloadFn(msg, MsgType.VIEDO, viedoPath);