update 2 2.6.0

Author: Jamling

lib/core-0.0.1.jar

@@ -11,6 +11,7 @@
     ]]></description>
 
     <change-notes><![CDATA[
+    v2.6.0 2019-02-26, 优化微信
     v2.4.0 2018-05-10, 修复部分微信用户登录异常的问题
     v2.3.2 2018-03-05, 优化链接自动识别，优化聊天记录
     v2.3.0 2018-02-27, 添加发送工程中的文件，图灵机器人，消息群发等功能<br/>

lib/smartqq-0.0.1.jar

@@ -15,20 +15,19 @@
  */
 package cn.ieclipse.smartim;
 
-import cn.ieclipse.smartim.helper.FileStorage;
-import cn.ieclipse.smartim.settings.SmartIMSettings;
-
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cn.ieclipse.util.FileStorage;
+import cn.ieclipse.smartim.settings.SmartIMSettings;
+
 /**
  * 类/接口描述
- * 
+ *
  * @author Jamling
  * @date 2017年10月23日
- *       
  */
 public class IMHistoryManager {
     private Map<String, FileStorage> stores = new HashMap<>();
@@ -37,30 +36,31 @@ public class IMHistoryManager {
     private long ts = System.currentTimeMillis();
 
     private static IMHistoryManager instance = new IMHistoryManager();
-    
+    public static final String HISTORY_NAME = "history";
+
     public static IMHistoryManager getInstance() {
         return instance;
     }
-    
-    private FileStorage get(SmartClient client, String uin) {
+
+    private FileStorage get(File dir, String uin) {
         FileStorage fs = stores.get(uin);
         if (fs == null) {
-            File f = new File(client.getWorkDir("history"), uin);
+            File f = new File(dir, uin);
             fs = new FileStorage(size, f.getAbsolutePath());
             boolean persistent = SmartIMSettings.getInstance().getState().LOG_HISTORY;
             fs.setPersistent(persistent);
             stores.put(uin, fs);
         }
         return fs;
     }
-    
-    public List<String> load(SmartClient client, String uin) {
-        FileStorage fs = get(client, uin);
+
+    public List<String> load(File dir, String uin) {
+        FileStorage fs = get(dir, uin);
         return fs.getLast(max);
     }
-    
-    public boolean save(SmartClient client, String uin, String rawMsg) {
-        FileStorage fs = get(client, uin);
+
+    public boolean save(File dir, String uin, String rawMsg) {
+        FileStorage fs = get(dir, uin);
         boolean ret = fs.append(rawMsg);
         ret = ret && fs.isPersistent();
         if (System.currentTimeMillis() - ts > 1000 * 120) {
@@ -70,8 +70,8 @@ public boolean save(SmartClient client, String uin, String rawMsg) {
         return ret;
     }
 
-    public boolean clear(SmartClient client, String uin) {
-        FileStorage fs = get(client, uin);
+    public boolean clear(File dir, String uin) {
+        FileStorage fs = get(dir, uin);
         fs.release();
         return true;
     }

lib/wechat-0.0.1.jar

@@ -32,7 +32,7 @@ protected void handle(boolean unknown, boolean notify,
         String msg = getMsgContent(message, from);
         if (!unknown) {
             String hf = EncodeUtils.getMd5(from.getContact().getName());
-            IMHistoryManager.getInstance().save(client, hf, msg);
+            IMHistoryManager.getInstance().save(client.getWorkDir(IMHistoryManager.HISTORY_NAME), hf, msg);
         }
 
         if (notify) {

resources/META-INF/plugin.xml

@@ -64,14 +64,22 @@ public void stateChanged() {
     }
 
     private void createContents(@NotNull Project project, @NotNull ToolWindow toolWindow) {
-        SmartQQPanel qqPanel = new SmartQQPanel(project, toolWindow);
+        File dir = new File(getWorkDir(), "SmartIM");
+        if (dir.exists()) {
+            dir.mkdirs();
+        }
+        System.setProperty("log.home", dir.getAbsolutePath());
         ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
-        Content content = contentFactory.createContent(qqPanel, "SmartQQ", false);
-        toolWindow.getContentManager().addContent(content, 0);
+        Content content = null;
 
         WechatPanel wechatPanel = new WechatPanel(project, toolWindow);
         content = contentFactory.createContent(wechatPanel, "Wechat", false);
+        toolWindow.getContentManager().addContent(content, 0);
+
+        SmartQQPanel qqPanel = new SmartQQPanel(project, toolWindow);
+        content = contentFactory.createContent(qqPanel, "SmartQQ", false);
         toolWindow.getContentManager().addContent(content, 1);
+
     }
 
     private Content createContentPanel(Project project, ToolWindow toolWindow) {

src/cn/ieclipse/smartim/IMHistoryManager.java

@@ -3,6 +3,8 @@
 import cn.ieclipse.smartim.console.MockChatConsole;
 import cn.ieclipse.smartim.model.impl.AbstractContact;
 import cn.ieclipse.smartim.views.IMPanel;
+import cn.ieclipse.wechat.WXChatConsoleMock;
+import cn.ieclipse.wechat.WechatPanel;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import icons.SmartIcons;
 
@@ -29,8 +31,16 @@ public String getUin() {
             }
         };
 
-        MockChatConsole console = new MockChatConsole(contact, imPanel);
+        MockChatConsole console = null;
+        if (imPanel instanceof WechatPanel) {
+            console = new WXChatConsoleMock(contact, imPanel);
+        }
+        else {
+            console = new MockChatConsole(contact, imPanel);
+        }
         console.setName(contact.getName());
         imPanel.addConsole(console);
+        imPanel.randBling();
+        console.initMockMsg();
     }
 }

src/cn/ieclipse/smartim/IMReceiveCallback.java

@@ -9,8 +9,8 @@
 /**
  * Created by Jamling on 2017/7/11.
  */
-public class SettingAction extends IMPanelAction {
-    public SettingAction(IMPanel panel) {
+public class SettingsAction extends IMPanelAction {
+    public SettingsAction(IMPanel panel) {
         super(panel, "设置", "首选项及设置", SmartIcons.settings);
         this.imPanel = panel;
     }

src/cn/ieclipse/smartim/IMWindowFactory.java

@@ -80,8 +80,8 @@ public static String formatMsg(long time, String name, CharSequence msg) {
     }
 
     public static boolean isMySendMsg(String raw) {
-        return raw.matches("^\\d{2}:\\d{2}:\\d{2} [.\\s\\S]*")
-                || raw.startsWith("<div");
+        return raw.startsWith("<div")
+                || raw.matches("^\\d{2}:\\d{2}:\\d{2} [.\\s\\S]*");
     }
 
     public static String formatHtmlMsg(String msg, boolean encodeHtml) {
@@ -116,7 +116,7 @@ public static String formatHtmlMsg(boolean my, boolean encodeHtml,
         return String.format(DIV_ROW_FORMAT, clz, t, name, name, content);
     }
 
-    private static String autoReviewLink(String input) {
+    public static String autoReviewLink(String input) {
         Matcher m = Pattern.compile(CODE_REGEX, Pattern.MULTILINE)
                 .matcher(input);
         if (m.find()) {
@@ -133,7 +133,7 @@ private static String autoReviewLink(String input) {
         return input;
     }
 
-    private static String autoLink(String input) {
+    public static String autoLink(String input) {
         Pattern p = Patterns.WEB_URL;// Pattern.compile(LINK_REGEX, Pattern.MULTILINE);
         Matcher m = p.matcher(input);
 
@@ -153,7 +153,23 @@ private static String autoLink(String input) {
                 int e = ends.get(i);
                 String g = groups.get(i);
                 String http = null;
-                if (!g.matches(Patterns.PROTOCOL)) {
+
+                String ucs = "";
+                String rg = UCS_REGEX_BEGIN.matcher(g).replaceAll("$2");
+                if (g.length() > rg.length()) {
+                    ucs = g.substring(0, g.length() - rg.length());
+                    g = rg;
+                    s = s + ucs.length();
+                }
+
+                rg = UCS_REGEX_END.matcher(g).replaceAll("$1");
+                if (g.length() > rg.length()) {
+                    ucs = g.substring(rg.length());
+                    g = rg;
+                    e = e - ucs.length();
+                }
+
+                if (!PROTOCOL.matcher(g).find()) {
                     boolean f = g.startsWith("www.") || g.endsWith(".com")
                             || g.endsWith(".cn");
                     if (!f) {
@@ -176,14 +192,19 @@ private static String autoLink(String input) {
                         continue;
                     }
                 }
-                sb.delete(pos, offset + e);
+                sb.delete(offset + s, offset + e);
+                String link = http == null ? g : http + g;
                 String ng = g;
-                if (IMG_EXTS.indexOf(FileUtils.getExtension(g).toLowerCase()) >= 0) {
-                    ng = String.format("<a href=\"%s\"><img src=\"%s\" alt=\"%s\" border=\"0\"/></a>", g, g, g);
-                } else {
-                    ng = String.format("<a href=\"%s\">%s</a>", g, g);
+                if (IMG_EXTS.indexOf(
+                        FileUtils.getExtension(g).toLowerCase()) >= 0) {
+                    ng = String.format(
+                            "<a href=\"%s\"><img src=\"%s\" alt=\"%s\" border=\"0\"/></a>",
+                            link, link, "无法预览，请尝试点击");
+                }
+                else {
+                    ng = String.format("<a href=\"%s\">%s</a>", link, g);
                 }
-                sb.insert(pos, ng);
+                sb.insert(offset + s, ng);
                 offset += ng.length() - g.length();
             }
             return sb.toString();
@@ -198,4 +219,19 @@ private static String autoLink(String input) {
     public static final List<String> IMG_EXTS = Arrays.asList("png", "jpg", "gif", "webp");
     public static final String CODE_REGEX = "Code: [\\S ]+:[\\d]+ ?";
     public static final String LINK_REGEX = "(https?|ftp|file)://(([\\w-~]+).)+([\\w-~\\/])+(((?!\\.)(\\S))+(\\.\\w+(\\?(\\w+=\\S&?)*)?)?)?";
+    public static final String UCS_CHAR = "[" + "\u00A0-\uD7FF"
+            + "\uF900-\uFDCF" + "\uFDF0-\uFFEF" + "\uD800\uDC00-\uD83F\uDFFD"
+            + "\uD840\uDC00-\uD87F\uDFFD" + "\uD880\uDC00-\uD8BF\uDFFD"
+            + "\uD8C0\uDC00-\uD8FF\uDFFD" + "\uD900\uDC00-\uD93F\uDFFD"
+            + "\uD940\uDC00-\uD97F\uDFFD" + "\uD980\uDC00-\uD9BF\uDFFD"
+            + "\uD9C0\uDC00-\uD9FF\uDFFD" + "\uDA00\uDC00-\uDA3F\uDFFD"
+            + "\uDA40\uDC00-\uDA7F\uDFFD" + "\uDA80\uDC00-\uDABF\uDFFD"
+            + "\uDAC0\uDC00-\uDAFF\uDFFD" + "\uDB00\uDC00-\uDB3F\uDFFD"
+            + "\uDB44\uDC00-\uDB7F\uDFFD"
+            + "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]]";
+    public static final Pattern UCS_REGEX_END = Pattern
+            .compile("(.+?)(" + UCS_CHAR + "+$)");
+    public static final Pattern UCS_REGEX_BEGIN = Pattern
+            .compile("^(" + UCS_CHAR + "+)" + "(.+?)");
+    public static final Pattern PROTOCOL = Pattern.compile(Patterns.PROTOCOL);
 }