From e40df481a9b70399e90196bddbc8dc41af3aa72b Mon Sep 17 00:00:00 2001
From: menq <mengqiang.q@gmail.com>
Date: Thu, 13 Oct 2016 17:52:35 +0800
Subject: [PATCH] [update]

---
 temp/wxqr.png | Bin 0 -> 501 bytes
 wxbot.py      |  33 ++++++++-------------------------
 2 files changed, 8 insertions(+), 25 deletions(-)
 create mode 100644 temp/wxqr.png

diff --git a/temp/wxqr.png b/temp/wxqr.png
new file mode 100644
index 0000000000000000000000000000000000000000..b37581f2cffad6efa5f6e6a6dca56e28d5ccba0d
GIT binary patch
literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq00C$K00C$L00000Ql4CR0005JNkl<Zc%1Fk
z+fD>A3<FUA|4#?e#BK{hS{Nhkg9kC{<zye$O&9f>2hq{d(b4au(a-0gG_P6OyU{Mq
zuO2hGYwL#5&-F@UvtFx7N4wExy|y|Ql|}!X)<mJ`{)x6~zWbJ+Z1}DlMnBg5)DM5N
z8|~73=E4E9;cJ6vk7fs;^~~2kZ=PtM#w>17yQmu?+NV1J1_4%awx4K^RwA`;pOp!7
zy3&b$s`u|_oo01`nj+e%iz{jieg^-eZCd>>WxdhEX^e_?>i+rxR*Ii4+NNtx{nTlM
zGn{Cf?re17bU-y39WdIUYwXSfXKl}-ZJK$YTVU4I0#H9hd$hJEm=a(*746iDq7=?C
zuH!C>Ht0@f1*2oH`ePVv(LD6i4!Eu$;9$`f4IX*jImHgZ)JI!&LyX>&PEDoJCS7uv
zyQeXCzh@c!XRS5mf*J1yiT3F}@H+XJbl4%l^|8^<HNSl9&QMybG}@>!865F28ny$X
zje4@Ft44YCO0-eWdB5(TGr2pRXph!=UR6v897a1e$J_49DB7s`)@n~!{w1C0hnjiJ
rwZpYF#*tREMZf$+M@L6Tzl;6=T~09&n$Vg#00000NkvXXu0mjfBWUz%

literal 0
HcmV?d00001

diff --git a/wxbot.py b/wxbot.py
index 200d776..498e1b8 100644
--- a/wxbot.py
+++ b/wxbot.py
@@ -595,30 +595,8 @@ def proc_msg(self):
                     break
                 elif retcode == '1101':  # 从其它设备上登了网页微信
                     break
-                elif retcode == '0':
-                    if selector == '2':  # 有新消息
-                        r = self.sync()
-                        if r is not None:
-                            self.handle_msg(r)
-                    elif selector == '3':  # 未知
-                        r = self.sync()
-                        if r is not None:
-                            self.handle_msg(r)
-                    elif selector == '6':  # 可能是红包
-                        r = self.sync()
-                        if r is not None:
-                            self.handle_msg(r)
-                    elif selector == '7':  # 在手机上操作了微信
-                        r = self.sync()
-                        if r is not None:
-                            self.handle_msg(r)
-                    elif selector == '0':  # 无事件
-                        pass
-                    else:
-                        print '[DEBUG] sync_check:', retcode, selector
-                        r = self.sync()
-                        if r is not None:
-                            self.handle_msg(r)
+                elif retcode != -1:
+                    self.sync_and_handle()
                 else:
                     print '[DEBUG] sync_check:', retcode, selector
                 self.schedule()
@@ -629,6 +607,11 @@ def proc_msg(self):
             if check_time < 0.8:
                 time.sleep(1 - check_time)
 
+    def sync_and_handle(self):
+        r = self.sync()
+        if r is not None:
+            self.handle_msg(r)
+
     def send_msg_by_uid(self, word, dst='filehelper'):
         url = self.base_uri + '/webwxsendmsg?pass_ticket=%s' % self.pass_ticket
         msg_id = str(int(time.time() * 1000)) + str(random.random())[:5].replace('.', '')
@@ -977,7 +960,7 @@ def status_notify(self):
         return dic['BaseResponse']['Ret'] == 0
 
     def test_sync_check(self):
-        for host in ['webpush', 'webpush2']:
+        for host in ['webpush']:
             self.sync_host = host
             retcode = self.sync_check()[0]
             if retcode == '0':