增加example

hanccc
Commit 288f7b2a authored Jan 04, 2017 by hanccc
Showing 7 changed files with 120 additions and 20 deletions
src/Collections/Account.php
src/Core/Http.php
src/Core/MessageHandler.php
src/Core/Server.php
src/Message/Message.php
test/forward.php
test/from_type.php
--- a/src/Collections/Account.php
+++ b/src/Collections/Account.php
@@ -104,7 +104,7 @@ class Account extends Collection
     * @param $id
     * @return array
     */
-    public function getContact($id)
+    public function getContactByUsername($id)
    {
        $target = static::$instance->get(static::NORMAL_MEMBER);
@@ -118,4 +118,51 @@ class Account extends Collection
        return $target[$id] ?? null;
    }
+    /**
+     * 获取联系人列表
+     *
+     * @return Collection
+     */
+    public function getNormalMembers()
+    {
+        $target = static::$instance->get(static::NORMAL_MEMBER);
+        return collect($target);
+    }
+    /**
+     * 根据微信号获取联系人
+     *
+     * @param $id
+     * @return mixed
+     */
+    public function getContactById($id)
+    {
+        $contact = $this->getNormalMembers()->filter(function($item, $key) use ($id){
+            if($item['info']['Alias'] === $id){
+                return true;
+            }
+        })->first();
+        return $contact;
+    }
+    /**
+     * 根据微信号获取联系username
+     *
+     * @param $id
+     * @return mixed
+     */
+    public function getUsernameById($id)
+    {
+        $contact = $this->getNormalMembers()->search(function($item, $key) use ($id){
+            if($item['info']['Alias'] === $id){
+                return true;
+            }
+        });
+        return $contact;
+    }
 }
\ No newline at end of file
--- a/src/Core/Http.php
+++ b/src/Core/Http.php
@@ -23,7 +23,6 @@ class Http
    public static function getInstance()
    {
        if(!static::$instance){
-            echo 'http is null';
            static::$instance = new Http();
        }

--- a/src/Core/MessageHandler.php
+++ b/src/Core/MessageHandler.php
@@ -21,6 +21,8 @@ class MessageHandler
    private $handler;
+    private $customHandler;
    static $instance = null;
    /**
@@ -46,6 +48,15 @@ class MessageHandler
        $this->handler = $closure;
    }
+    public function setCustomHandler(Closure $closure)
+    {
+        if(!$closure instanceof Closure){
+            throw new \Exception('message handler must be a closure!');
+        }
+        $this->customHandler = $closure;
+    }
    /**
     * listen the chat api
     */
@@ -54,6 +65,11 @@ class MessageHandler
        $this->preCheckSync();
        while (true){
+            if($this->customHandler){
+                call_user_func_array($this->customHandler, []);
+            }
            $time = time();
            list($retCode, $selector) = $this->checkSync();

--- a/src/Core/Server.php
+++ b/src/Core/Server.php
@@ -292,6 +292,15 @@ class Server
        MessageHandler::getInstance()->setMessageHandler($closure);
    }
+    public function setCustomerHandler(\Closure $closure)
+    {
+        if(!is_callable($closure)){
+            throw new \Exception('[ERROR] message handler must be a closure!');
+        }
+        MessageHandler::getInstance()->setCustomHandler($closure);
+    }
    public function debug($debug = true)
    {
        $this->debug = $debug;

--- a/src/Message/Message.php
+++ b/src/Message/Message.php
@@ -29,6 +29,8 @@ class Message
     */
    public $sender;
+    public $username;
    public $to;
    public $content;
@@ -38,7 +40,7 @@ class Message
    /**
     * @var string 消息发送者类型
     */
-    public $FromType;
+    public $fromType;
    /**
     * @var string 消息类型
@@ -84,34 +86,35 @@ class Message
     */
    private function setFrom()
    {
-        $this->from = Account::getInstance()->getContact($this->rawMsg['FromUserName']);
+        $this->from = Account::getInstance()->getContactByUsername($this->rawMsg['FromUserName']);
+        $this->username = $this->rawMsg['FromUserName'];
    }
    private function setTo()
    {
-        $this->to = Account::getInstance()->getContact($this->rawMsg['ToUserName']);
+        $this->to = Account::getInstance()->getContactByUsername($this->rawMsg['ToUserName']);
    }
    private function setFromType()
    {
        if ($this->rawMsg['MsgType'] == 51) {
-            $this->FromType = 'System';
+            $this->fromType = 'System';
        } elseif ($this->rawMsg['MsgType'] == 37) {
-            $this->FromType = 'FriendRequest';
+            $this->fromType = 'FriendRequest';
        } elseif ($this->rawMsg['FromUserName'] === myself()->userName) {
-            $this->FromType = 'Self';
+            $this->fromType = 'Self';
        } elseif ($this->rawMsg['ToUserName'] === 'filehelper') {
-            $this->FromType = 'FileHelper';
+            $this->fromType = 'FileHelper';
        } elseif (substr($this->rawMsg['FromUserName'], 0, 2) === '@@') { # group
-            $this->FromType = 'Group';
+            $this->fromType = 'Group';
        } elseif (ContactAccount::getInstance()->isContact($this->rawMsg['FromUserName'])) {
-            $this->FromType = 'Contact';
+            $this->fromType = 'Contact';
        } elseif (OfficialAccount::getInstance()->isPublic($this->rawMsg['FromUserName'])) {
-            $this->FromType = 'Public';
+            $this->fromType = 'Public';
        } elseif (SpecialAccount::getInstance()->get($this->rawMsg['FromUserName'], false)) {
-            $this->FromType = 'Special';
+            $this->fromType = 'Special';
        } else {
-            $this->FromType = 'Unknown';
+            $this->fromType = 'Unknown';
        }
    }
@@ -129,12 +132,12 @@ class Message
     */
    private function setTypeByFrom()
    {
-        if($this->FromType === 'System'){
+        if($this->fromType === 'System'){
            $this->type = 'Empty';
-        }elseif ($this->FromType === 'FileHelper'){ # File Helper
+        }elseif ($this->fromType === 'FileHelper'){ # File Helper
            $this->type = 'Text';
            $this->content->msg = $this->formatContent($this->rawMsg['Content']);
-        }elseif ($this->FromType === 'Group'){
+        }elseif ($this->fromType === 'Group'){
            $this->handleGroupContent($this->rawMsg['Content']);
        }
    }
@@ -203,7 +206,7 @@ class Message
     */
    private function setLocationMessage()
    {
-        $this->FromType = 'Location';
+        $this->fromType = 'Location';
 //        $this->url = $this->rawMsg['Url'];
        $this->content->msg = Location::getLocationText($this->rawMsg['Content']);
    }

--- a/test/forward.php
+++ b/test/forward.php
@@ -17,9 +17,11 @@ $client = new \GuzzleHttp\Client();
 $robot->server->setMessageHandler(function($message) use ($client, $robot){
    if($message->type === 'Text'){
-//        print_r($message);
+        $contact = \Hanson\Robot\Collections\Account::getInstance()->getUsernameById('hanson1994');
-//        echo  $message->rawMsg['FromUserName'];
        \Hanson\Robot\Message\Message::send('hi', $message->rawMsg['FromUserName']);
+        \Hanson\Robot\Message\Message::send($message->content, $contact);
    }
 });
+$robot->server->setCustomerHandler(function(){
+});
 $robot->server->run();
--- a/test/from_type.php
+++ b/test/from_type.php
+<?php
+/**
+ * Created by PhpStorm.
+ * User: HanSon
+ * Date: 2016/12/7
+ * Time: 16:33
+ */
+require_once __DIR__ . './../vendor/autoload.php';
+$robot = new \Hanson\Robot\Foundation\Robot([
+    'tmp' => realpath('./tmp') . '/',
+    'debug' => true,
+]);
+$client = new \GuzzleHttp\Client();
+$robot->server->setMessageHandler(function($message) use ($client, $robot){
+    /** @var $message \Hanson\Robot\Message\Message */
+    if($message->type === 'Text'){
+        \Hanson\Robot\Message\Message::send($message->fromType, $message->username);
+    }
+});
+$robot->server->run();