release 3.0.3

Jamling · Feb 12, 2018 · 8ca2836 · 8ca2836
1 parent af3e80c
commit 8ca2836
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 11 deletions.
diff --git a/cn.ieclipse.smartqq.feature/feature.xml b/cn.ieclipse.smartqq.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="cn.ieclipse.smartqq.feature"
       label="SmartQQ Feature"
-      version="3.0.1.qualifier"
+      version="3.0.3.qualifier"
       provider-name="ieclipse.cn"
       plugin="cn.ieclipse.smartqq">
 

diff --git a/cn.ieclipse.smartqq/META-INF/MANIFEST.MF b/cn.ieclipse.smartqq/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SmartQQ
 Bundle-SymbolicName: cn.ieclipse.smartqq;singleton:=true
-Bundle-Version: 3.0.1.qualifier
+Bundle-Version: 3.0.3.qualifier
 Bundle-Activator: cn.ieclipse.smartim.IMPlugin
 Bundle-Vendor: ieclipse.cn
 Require-Bundle: org.eclipse.ui,

diff --git a/cn.ieclipse.smartqq/libs/smartqq-0.0.1.jar b/cn.ieclipse.smartqq/libs/smartqq-0.0.1.jar
diff --git a/cn.ieclipse.smartqq/src/cn/ieclipse/smartqq/QQReceiveCallback.java b/cn.ieclipse.smartqq/src/cn/ieclipse/smartqq/QQReceiveCallback.java
@@ -89,6 +89,7 @@ protected String getMsgContent(AbstractMessage message, AbstractFrom from) {
         if (message instanceof QQMessage) {
             QQMessage m = (QQMessage) message;
             msg = IMUtils.formatHtmlMsg(m.getTime(), name, m.getContent());
+            msg = QQUtils.decodeEmoji(msg);
         }
         return msg;
     }

diff --git a/cn.ieclipse.smartqq/src/cn/ieclipse/smartqq/QQUtils.java b/cn.ieclipse.smartqq/src/cn/ieclipse/smartqq/QQUtils.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-2017 ieclipse.cn.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.ieclipse.smartqq;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.scienjus.smartqq.model.Discuss;
+import com.scienjus.smartqq.model.DiscussInfo;
+import com.scienjus.smartqq.model.Group;
+import com.scienjus.smartqq.model.GroupInfo;
+
+import cn.ieclipse.smartim.common.IMUtils;
+import cn.ieclipse.smartim.model.IContact;
+import cn.ieclipse.util.StringUtils;
+import io.github.biezhi.wechat.model.Contact;
+
+/**
+ * 类/接口描述
+ * 
+ * @author Jamling
+ * @date 2018年2月12日
+ *       
+ */
+public class QQUtils {
+    public static char getContactChar(IContact target) {
+        char ch = 'F';
+        if (target instanceof Group || target instanceof GroupInfo) {
+            ch = 'G';
+        }
+        else if (target instanceof Discuss || target instanceof DiscussInfo) {
+            ch = 'D';
+        }
+        return ch;
+    }
+
+    public static String decodeEmoji(String src) {
+        return src;
+        // String regex = "\\[\"face\",([1-9][0-9])\\]";
+        // if (src != null) {
+        // String n = src.replaceAll(regex,
+        // "<span class=\"qqemoji qq_face qqface$1\" alt=\"QQ表情$1\"></span>");
+        // return n;
+        // }
+        // else {
+        // return "";
+        // }
+    }
+
+    public static void main(String[] args) {
+        String src = IMUtils.formatHtmlMsg(true, true,
+                System.currentTimeMillis(), "Me",
+                "1毛9[\"face\",0] [\"face\",71] 哈哈");
+        System.out.println(src);
+        System.out.println(decodeEmoji(src));
+    }
+}
diff --git a/cn.ieclipse.smartqq/src/cn/ieclipse/smartqq/console/QQChatConsole.java b/cn.ieclipse.smartqq/src/cn/ieclipse/smartqq/console/QQChatConsole.java
@@ -31,18 +31,13 @@
 import cn.ieclipse.smartim.preferences.QiniuPerferencePage;
 import cn.ieclipse.smartim.preferences.SettingsPerferencePage;
 import cn.ieclipse.smartim.views.IMContactView;
+import cn.ieclipse.smartqq.QQUtils;
 
 public class QQChatConsole extends IMChatConsole {
 
     public QQChatConsole(IContact target, IMContactView imPanel) {
         super(target, imPanel);
-        char ch = 'F';
-        if (target instanceof Group || target instanceof GroupInfo) {
-            ch = 'G';
-        }
-        else if (target instanceof Discuss || target instanceof DiscussInfo) {
-            ch = 'D';
-        }
+        char ch = QQUtils.getContactChar(target);
         IMG_NORMAL = LetterImageFactory.create(ch, SWT.COLOR_BLACK);
         IMG_SELECTED = LetterImageFactory.create(ch, SWT.COLOR_RED);
         setImage(IMG_NORMAL);

diff --git a/cn.ieclipse.smartqq/src/cn/ieclipse/smartqq/views/FriendLabelProvider.java b/cn.ieclipse.smartqq/src/cn/ieclipse/smartqq/views/FriendLabelProvider.java
@@ -8,9 +8,11 @@
 import com.scienjus.smartqq.model.Recent;
 
 import cn.ieclipse.smartim.common.LetterImageFactory;
+import cn.ieclipse.smartim.model.IContact;
 import cn.ieclipse.smartim.model.VirtualCategory;
 import cn.ieclipse.smartim.views.IMContactLabelProvider;
 import cn.ieclipse.smartim.views.IMContactView;
+import cn.ieclipse.smartqq.QQUtils;
 
 public class FriendLabelProvider extends IMContactLabelProvider {
 
@@ -53,6 +55,19 @@ else if (type == 2) {
                 return LetterImageFactory.create('D', SWT.COLOR_DARK_CYAN);
             }
         }
+        if (obj instanceof IContact) {
+            IContact target = (IContact) obj;
+            char ch = QQUtils.getContactChar(target);
+            if (ch == 'F') {
+                return LetterImageFactory.create(ch, SWT.COLOR_DARK_GREEN);
+            }
+            else if (ch == 'G') {
+                return LetterImageFactory.create(ch, SWT.COLOR_DARK_BLUE);
+            }
+            else if (ch == 'D') {
+                return LetterImageFactory.create(ch, SWT.COLOR_DARK_CYAN);
+            }
+        }
         return null;
     }
 }
diff --git a/cn.ieclipse.smartqq/src/cn/ieclipse/wechat/WXUtils.java b/cn.ieclipse.smartqq/src/cn/ieclipse/wechat/WXUtils.java
@@ -21,7 +21,6 @@
 import java.util.regex.Pattern;
 
 import cn.ieclipse.smartim.model.IContact;
-import cn.ieclipse.util.FileUtils;
 import cn.ieclipse.util.StringUtils;
 import io.github.biezhi.wechat.model.Contact;
 

diff --git a/cn.ieclipse.smartqq/src/cn/ieclipse/wechat/views/WXContactLabelProvider.java b/cn.ieclipse.smartqq/src/cn/ieclipse/wechat/views/WXContactLabelProvider.java
@@ -43,7 +43,18 @@ public Image getContactImage(Object obj) {
             Contact c = (Contact) obj;
             char ch = WXUtils.getContactChar(c);
             if (ch > 0) {
-                return LetterImageFactory.create(ch, SWT.COLOR_DARK_GREEN);
+                if (ch == 'F') {
+                    return LetterImageFactory.create(ch, SWT.COLOR_DARK_GREEN);
+                }
+                else if (ch == 'G') {
+                    return LetterImageFactory.create(ch, SWT.COLOR_DARK_BLUE);
+                }
+                else if (ch == 'P') {
+                    return LetterImageFactory.create(ch, SWT.COLOR_DARK_CYAN);
+                }
+                else if (ch == 'S') {
+                    return LetterImageFactory.create(ch, SWT.COLOR_DARK_RED);
+                }
             }
         }
         return null;