From b4291a7350570e469a3b17658eec1eb09684fe4f Mon Sep 17 00:00:00 2001
From: kale <kai.jin@duitang.com>
Date: Wed, 30 Mar 2016 16:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=87=8F=E5=B0=91=E4=BA=86=E9=9D=99=E6=80=81=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=20=E3=80=90=E5=9C=A8=E4=B8=8D=E4=BF=9D=E7=95=99=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8B=EF=BC=8C=E6=9C=AA=E5=AE=89=E8=A3=85=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E3=80=91=20=E5=85=A8=E9=83=A8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【在不保留活动下，安装了客户端】
剩余：微博登录

【在不保留活动下，安装了客户端，客户端未登录】
全部通过！

【关闭不保留活动时】
全部通过！
---
 app/src/main/AndroidManifest.xml              |   9 -
 .../com/liulishuo/engzo/MainActivity.java     | 222 +++++++++------
 .../com/liulishuo/engzo/MyLoginListener.java  | 109 --------
 .../com/liulishuo/engzo/MyShareListener.java  |   4 +-
 .../com/liulishuo/engzo/OAuthConstant.java    |   4 +-
 app/src/main/res/layout/activity_main.xml     |  48 +++-
 share/src/main/AndroidManifest.xml            |   9 +-
 .../com/liulishuo/share/LoginManager.java     | 264 ++++++++++++++++++
 .../java/com/liulishuo/share/ShareBlock.java  |  84 ++----
 .../com/liulishuo/share/ShareManager.java     | 104 +++++++
 .../{base/login => }/UserInfoListener.java    |   4 +-
 .../share/base/login/ILoginManager.java       |  15 -
 .../share/base/login/LoginListener.java       |  14 -
 .../share/base/share/IShareManager.java       |  15 -
 .../share/base/share/ShareStateListener.java  |  16 --
 .../share/{base => model}/AuthUserInfo.java   |   4 +-
 .../share/{base => model}/Constants.java      |   2 +-
 .../shareContent/ShareContent.java            |   2 +-
 .../shareContent/ShareContentMusic.java       |   4 +-
 .../shareContent/ShareContentPic.java         |   4 +-
 .../shareContent/ShareContentText.java        |   4 +-
 .../shareContent/ShareContentWebpage.java     |   4 +-
 .../liulishuo/share/qq/QQLoginManager.java    | 149 ----------
 .../share/qq/SL_QQHandlerActivity.java        |  47 ----
 .../share/qq/SL_QQLoginActivity.java          |  88 ++++++
 ...reManager.java => SL_QQShareActivity.java} | 129 +++++----
 .../com/liulishuo/share/type/LoginType.java   |   9 +
 .../com/liulishuo/share/type/ShareType.java   |  13 +
 .../{weibo => util}/AccessTokenKeeper.java    |   8 +-
 .../share/weibo/SL_WeiBoLoginActivity.java    | 104 ++++++-
 .../share/weibo/SL_WeiBoShareActivity.java    | 206 ++++++++++++--
 .../share/weibo/WeiboLoginManager.java        | 183 ------------
 .../share/weibo/WeiboShareManager.java        | 221 ---------------
 .../share/weixin/WeiXinHandlerActivity.java   |  16 +-
 .../share/weixin/WeiXinLoginManager.java      | 118 ++------
 .../share/weixin/WeiXinShareManager.java      |  78 ++----
 36 files changed, 1106 insertions(+), 1208 deletions(-)
 delete mode 100644 app/src/main/java/com/liulishuo/engzo/MyLoginListener.java
 create mode 100644 share/src/main/java/com/liulishuo/share/LoginManager.java
 create mode 100644 share/src/main/java/com/liulishuo/share/ShareManager.java
 rename share/src/main/java/com/liulishuo/share/{base/login => }/UserInfoListener.java (66%)
 delete mode 100644 share/src/main/java/com/liulishuo/share/base/login/ILoginManager.java
 delete mode 100644 share/src/main/java/com/liulishuo/share/base/login/LoginListener.java
 delete mode 100644 share/src/main/java/com/liulishuo/share/base/share/IShareManager.java
 delete mode 100644 share/src/main/java/com/liulishuo/share/base/share/ShareStateListener.java
 rename share/src/main/java/com/liulishuo/share/{base => model}/AuthUserInfo.java (84%)
 rename share/src/main/java/com/liulishuo/share/{base => model}/Constants.java (95%)
 rename share/src/main/java/com/liulishuo/share/{base => model}/shareContent/ShareContent.java (91%)
 rename share/src/main/java/com/liulishuo/share/{base => model}/shareContent/ShareContentMusic.java (93%)
 rename share/src/main/java/com/liulishuo/share/{base => model}/shareContent/ShareContentPic.java (96%)
 rename share/src/main/java/com/liulishuo/share/{base => model}/shareContent/ShareContentText.java (94%)
 rename share/src/main/java/com/liulishuo/share/{base => model}/shareContent/ShareContentWebpage.java (95%)
 delete mode 100644 share/src/main/java/com/liulishuo/share/qq/QQLoginManager.java
 delete mode 100644 share/src/main/java/com/liulishuo/share/qq/SL_QQHandlerActivity.java
 create mode 100644 share/src/main/java/com/liulishuo/share/qq/SL_QQLoginActivity.java
 rename share/src/main/java/com/liulishuo/share/qq/{QQShareManager.java => SL_QQShareActivity.java} (74%)
 create mode 100644 share/src/main/java/com/liulishuo/share/type/LoginType.java
 create mode 100644 share/src/main/java/com/liulishuo/share/type/ShareType.java
 rename share/src/main/java/com/liulishuo/share/{weibo => util}/AccessTokenKeeper.java (93%)
 delete mode 100644 share/src/main/java/com/liulishuo/share/weibo/WeiboLoginManager.java
 delete mode 100644 share/src/main/java/com/liulishuo/share/weibo/WeiboShareManager.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1f237bf..6323d9c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,15 +9,6 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         >
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name"
-            >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
 
         <activity
             android:name="com.tencent.tauth.AuthActivity"
diff --git a/app/src/main/java/com/liulishuo/engzo/MainActivity.java b/app/src/main/java/com/liulishuo/engzo/MainActivity.java
index 02ab5e1..c107a2d 100644
--- a/app/src/main/java/com/liulishuo/engzo/MainActivity.java
+++ b/app/src/main/java/com/liulishuo/engzo/MainActivity.java
@@ -1,26 +1,34 @@
 package com.liulishuo.engzo;
 
+import com.liulishuo.share.LoginManager;
 import com.liulishuo.share.ShareBlock;
-import com.liulishuo.share.base.share.ShareStateListener;
-import com.liulishuo.share.base.shareContent.ShareContent;
-import com.liulishuo.share.base.shareContent.ShareContentPic;
-import com.liulishuo.share.base.shareContent.ShareContentText;
-import com.liulishuo.share.base.shareContent.ShareContentWebpage;
-import com.liulishuo.share.qq.QQLoginManager;
-import com.liulishuo.share.qq.QQShareManager;
-import com.liulishuo.share.weibo.WeiboLoginManager;
-import com.liulishuo.share.weibo.WeiboShareManager;
-import com.liulishuo.share.weixin.WeiXinLoginManager;
-import com.liulishuo.share.weixin.WeiXinShareManager;
+import com.liulishuo.share.ShareManager;
+import com.liulishuo.share.UserInfoListener;
+import com.liulishuo.share.model.AuthUserInfo;
+import com.liulishuo.share.model.shareContent.ShareContent;
+import com.liulishuo.share.model.shareContent.ShareContentPic;
+import com.liulishuo.share.model.shareContent.ShareContentText;
+import com.liulishuo.share.model.shareContent.ShareContentWebpage;
+import com.liulishuo.share.type.LoginType;
+import com.liulishuo.share.type.ShareType;
 
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.RadioGroup;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
 
 /**
  * 步骤：
@@ -30,48 +38,53 @@
  */
 public class MainActivity extends AppCompatActivity {
 
-    public static final String TAG = "MainActivity";
+    public static final String URL = "https://www.zhihu.com/question/22913650";
 
-    private MyLoginListener mLoginListener;
+    public static final String TITLE = "标题";
 
-    private ShareStateListener mShareListener = new MyShareListener(this);
+    public static final String MSG = "描述信息";
 
-    private Bitmap mBitmap;
+    private MyLoginListener mLoginListener;
+
+    private ShareManager.ShareStateListener mShareListener = new MyShareListener(this);
 
     private ShareContent mShareContent;
 
+    private TextView mTextView;
+
+    private ImageView mImageView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        Drawable drawable = getResources().getDrawable(R.drawable.kale);
-        mBitmap = ((BitmapDrawable) drawable).getBitmap();
+        final Bitmap mBitmap = ((BitmapDrawable) getResources().getDrawable(R.drawable.kale)).getBitmap();
 
-        WeiboLoginManager.isWeiBoInstalled(this);
-        WeiboShareManager.isWeiBoInstalled(this);
+        LoginManager.isWeiBoInstalled(this);
+        ShareManager.isWeiBoInstalled(this);
 
-        WeiXinLoginManager.isWeiXinInstalled(this);
-        WeiXinShareManager.isWeiXinInstalled(this);
+        LoginManager.isWeiXinInstalled(this);
+        ShareManager.isWeiXinInstalled(this);
 
         ShareBlock.getInstance()
                 .initAppName("TestAppName")
                 .initSharePicFile(getApplication())
                 .initQQ(OAuthConstant.QQ_APPID, OAuthConstant.QQ_SCOPE)
-                .initWeiXin(OAuthConstant.WECHAT_APPID, OAuthConstant.WECHAT_SECRET)
-                .initWeibo(OAuthConstant.WEIBO_APPID, OAuthConstant.WEIBO_REDIRECT_URL, OAuthConstant.WEIBO_SCOPE);
+                .initWeiXin(OAuthConstant.WEIXIN_APPID, OAuthConstant.WEIXIN_SECRET)
+                .initWeiBo(OAuthConstant.WEIBO_APPID, OAuthConstant.WEIBO_REDIRECT_URL, OAuthConstant.WEIBO_SCOPE);
 
         RadioGroup shareType = (RadioGroup) findViewById(R.id.share_type_rg);
         shareType.check(R.id.rich_text);
 
-        mShareContent = new ShareContentWebpage("title", "hello world!，进入：http://www.baidu.com", "http://www.baidu.com", mBitmap);
+        mShareContent = new ShareContentWebpage(TITLE, MSG, URL, mBitmap);
 
         shareType.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 switch (checkedId) {
                     case R.id.rich_text:
-                        mShareContent = new ShareContentWebpage("title", "hello world!", "http://www.baidu.com", mBitmap);
+                        mShareContent = new ShareContentWebpage(TITLE, MSG, URL, mBitmap);
                         break;
                     case R.id.only_image:
                         mShareContent = new ShareContentPic(mBitmap);
@@ -82,79 +95,114 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
                 }
             }
         });
+        mTextView = (TextView) findViewById(R.id.userinfo_tv);
+        mImageView = (ImageView) findViewById(R.id.user_img_iv);
 
-        mLoginListener = new MyLoginListener(this, 0, ((TextView) findViewById(R.id.userinfo_tv)));
-
-        ///////////////////////////// QQ ///////////////////////////////
-
-        // QQ登录
-        findViewById(R.id.login_qq_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mLoginListener.setType(MyLoginListener.QQ);
-                new QQLoginManager().login(MainActivity.this, mLoginListener);
-            }
-        });
-
-        findViewById(R.id.share_qq_friend_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                new QQShareManager().share(MainActivity.this, mShareContent, ShareBlock.QQ_FRIEND, mShareListener);
-            }
-        });
-
-        findViewById(R.id.share_qZone_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                new QQShareManager().share(MainActivity.this, mShareContent, ShareBlock.QQ_ZONE, mShareListener);
-            }
-        });
+        mLoginListener = new MyLoginListener();
+    }
 
-        ///////////////////////////// weixin ///////////////////////////////
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.QQ登录:
+                mLoginListener.setType(LoginType.QQ);
+                LoginManager.login(this, mLoginListener, LoginType.QQ);
+                break;
+            case R.id.微信登录:
+                mLoginListener.setType(LoginType.WEIXIN);
+                LoginManager.login(this, mLoginListener, LoginType.WEIXIN);
+                break;
+            case R.id.微博登录:
+                mLoginListener.setType(LoginType.WEIBO);
+                LoginManager.login(this, mLoginListener, LoginType.WEIBO);
+                break;
+
+            case R.id.分享给QQ好友:
+                ShareManager.share(this, mShareContent, ShareType.QQ_FRIEND, mShareListener);
+                break;
+            case R.id.分享到QQ空间:
+                ShareManager.share(this, mShareContent, ShareType.QQ_ZONE, mShareListener);
+                break;
+            case R.id.分享给微信好友:
+                ShareManager.share(this, mShareContent, ShareType.WEIXIN_FRIEND, mShareListener);
+                break;
+            case R.id.分享到微信朋友圈:
+                ShareManager.share(this, mShareContent, ShareType.WEIXIN_FRIEND_ZONE, mShareListener);
+                break;
+            case R.id.分享到微博:
+                ShareManager.share(this, mShareContent, ShareType.WEIBO_TIME_LINE, mShareListener);
+                break;
+        }
+    }
 
-        // 微信登录
-        findViewById(R.id.login_wechat_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mLoginListener.setType(MyLoginListener.WEIXIN);
-                new WeiXinLoginManager().login(MainActivity.this, mLoginListener);
-            }
-        });
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            mImageView.setImageBitmap((Bitmap) msg.obj);
+        }
+    };
 
-        // 微信分享到回话
-        findViewById(R.id.share_wechat_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                new WeiXinShareManager().share(MainActivity.this, mShareContent, ShareBlock.WEIXIN_FRIEND, mShareListener);
-            }
-        });
+    public class MyLoginListener implements LoginManager.LoginListener {
 
-        // 微信分享到朋友圈
-        findViewById(R.id.share_friends_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                new WeiXinShareManager().share(MainActivity.this, mShareContent, ShareBlock.WEIXIN_FRIEND_ZONE, mShareListener);
-            }
-        });
+        public static final String TAG = "LoginListener";
 
-        ///////////////////////////// Weibo ///////////////////////////////
+        private LoginType mType;
 
-        findViewById(R.id.login_weibo_btn).setOnClickListener(new View.OnClickListener() {
+        private UserInfoListener mUserInfoListener = new UserInfoListener() {
             @Override
-            public void onClick(View view) {
-                mLoginListener.setType(MyLoginListener.WEIBO);
-                new WeiboLoginManager().login(MainActivity.this, mLoginListener);
+            public void onSuccess(final AuthUserInfo userInfo) {
+                String str = " nickname = " + userInfo.nickName
+                        + "\n sex = " + userInfo.sex
+                        + "\n id = " + userInfo.userId;
+                mTextView.setText(str);
+
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            HttpURLConnection conn = (HttpURLConnection) new URL(userInfo.headImgUrl).openConnection();
+                            Bitmap bmp = BitmapFactory.decodeStream(conn.getInputStream());
+                            Message msg = new Message();
+                            msg.obj = bmp;
+                            mHandler.sendMessage(msg);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }).start();
             }
-        });
 
-        findViewById(R.id.share_weibo_btn).setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                new WeiboShareManager().share(MainActivity.this, mShareContent, ShareBlock.WEIBO_TIME_LINE, mShareListener);
+            public void onError(String msg) {
+                mTextView.setText(" 出错了！\n" + msg);
             }
-        });
-
+        };
+
+        public void setType(LoginType type) {
+            mType = type;
+        }
+
+        @Override
+        public void onSuccess(String accessToken, String userId, long expiresIn, String data) {
+            Log.d(TAG, "accessToken = " + accessToken);
+            Log.d(TAG, "uid = " + userId);
+            Log.d(TAG, "expires_in = " + expiresIn);
+            Log.d(TAG, "登录成功");
+            Toast.makeText(MainActivity.this, "登录成功", Toast.LENGTH_SHORT).show();
+
+            LoginManager.getUserInfo(accessToken, userId, mUserInfoListener, mType);
+        }
+
+        @Override
+        public void onError(String msg) {
+            Toast.makeText(getApplicationContext(), "登录失败,失败信息：" + msg, Toast.LENGTH_SHORT).show();
+        }
+
+        @Override
+        public void onCancel() {
+            Log.d(TAG, "取消登录");
+            Toast.makeText(getApplicationContext(), "取消登录", Toast.LENGTH_SHORT).show();
+        }
     }
 
 }
-
diff --git a/app/src/main/java/com/liulishuo/engzo/MyLoginListener.java b/app/src/main/java/com/liulishuo/engzo/MyLoginListener.java
deleted file mode 100644
index 76cde82..0000000
--- a/app/src/main/java/com/liulishuo/engzo/MyLoginListener.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.liulishuo.engzo;
-
-import com.liulishuo.share.base.AuthUserInfo;
-import com.liulishuo.share.base.login.LoginListener;
-import com.liulishuo.share.base.login.UserInfoListener;
-import com.liulishuo.share.qq.QQLoginManager;
-import com.liulishuo.share.weibo.WeiboLoginManager;
-import com.liulishuo.share.weixin.WeiXinLoginManager;
-
-import android.app.Activity;
-import android.util.Log;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * @author Jack Tony
- * @date 2015/10/18
- */
-public class MyLoginListener implements LoginListener {
-
-    public static final String TAG = "LoginListener";
-
-    public static final int QQ = 0;
-
-    public static final int WEIBO = 1;
-
-    public static final int WEIXIN = 2;
-
-    private Activity mActivity;
-
-    private int mType;
-
-    private TextView mTextView;
-
-    private UserInfoListener mUserInfoListener = new UserInfoListener() {
-        @Override
-        public void onSuccess(AuthUserInfo userInfo) {
-            String str = " nickname = " + userInfo.nickName
-                    + "\n sex = " + userInfo.sex
-                    + "\n imageUrl = " + userInfo.headImgUrl
-                    + "\n id = " + userInfo.userId;
-            mTextView.setText(str);
-        }
-
-        @Override
-        public void onError(String msg) {
-            String type;
-            switch (mType) {
-                case QQ:
-                    type = "qq";
-                    break;
-                case WEIBO:
-                    type = "weibo";
-                    break;
-                case WEIXIN:
-                    type = "weixin";
-                    break;
-                
-                default:
-                    type = "qq"; 
-            }
-            String text = type + " 出错了！\n" + msg;
-            mTextView.setText(text);
-        }
-    };
-
-    public void setType(int type) {
-        mType = type;
-    }
-
-    public MyLoginListener(Activity activity, int type, TextView textView) {
-        mActivity = activity;
-        mType = type;
-        mTextView = textView;
-    }
-
-    @Override
-    public void onSuccess(String accessToken, String userId, long expiresIn, String data) {
-        Log.d(TAG, "accessToken = " + accessToken);
-        Log.d(TAG, "uid = " + userId);
-        Log.d(TAG, "expires_in = " + expiresIn);
-        Log.d(TAG, "登录成功");
-        Toast.makeText(mActivity, "登录成功", Toast.LENGTH_SHORT).show();
-
-        switch (mType) {
-            case QQ:
-                QQLoginManager.getUserInfo(accessToken, userId, mUserInfoListener);
-                break;
-            case WEIXIN:
-                WeiXinLoginManager.getUserInfo(accessToken, userId, mUserInfoListener);
-                break;
-            case WEIBO:
-                WeiboLoginManager.getUserInfo(accessToken, userId, mUserInfoListener);
-                break;
-            default:
-        }
-    }
-
-    @Override
-    public void onError(String msg) {
-        Toast.makeText(mActivity, "登录失败,失败信息：" + msg, Toast.LENGTH_SHORT).show();
-    }
-
-    @Override
-    public void onCancel() {
-        Log.d(TAG, "取消登录");
-        Toast.makeText(mActivity, "取消登录", Toast.LENGTH_SHORT).show();
-    }
-}
diff --git a/app/src/main/java/com/liulishuo/engzo/MyShareListener.java b/app/src/main/java/com/liulishuo/engzo/MyShareListener.java
index e3e3ced..df594eb 100644
--- a/app/src/main/java/com/liulishuo/engzo/MyShareListener.java
+++ b/app/src/main/java/com/liulishuo/engzo/MyShareListener.java
@@ -1,6 +1,6 @@
 package com.liulishuo.engzo;
 
-import com.liulishuo.share.base.share.ShareStateListener;
+import com.liulishuo.share.ShareManager;
 
 import android.content.Context;
 import android.util.Log;
@@ -10,7 +10,7 @@
  * @author Jack Tony
  * @date 2015/10/23
  */
-public class MyShareListener implements ShareStateListener {
+public class MyShareListener implements ShareManager.ShareStateListener {
 
     private String TAG = "ShareListener";
 
diff --git a/app/src/main/java/com/liulishuo/engzo/OAuthConstant.java b/app/src/main/java/com/liulishuo/engzo/OAuthConstant.java
index 8fffacf..b88ae5e 100644
--- a/app/src/main/java/com/liulishuo/engzo/OAuthConstant.java
+++ b/app/src/main/java/com/liulishuo/engzo/OAuthConstant.java
@@ -16,7 +16,7 @@ public class OAuthConstant {
 
     public static final String WEIBO_REDIRECT_URL = "xxx";
 
-    public static final String WECHAT_APPID = "xxx";
+    public static final String WEIXIN_APPID = "xxx";
 
-    public static final String WECHAT_SECRET = "xxx";
+    public static final String WEIXIN_SECRET = "xxx";
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e0a866..bba34b9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,24 +11,27 @@
     >
 
     <Button
-        android:id="@+id/login_wechat_btn"
+        android:id="@+id/微信登录"
         android:layout_width="180dp"
         android:layout_height="40dp"
         android:text="微信登录"
+        android:onClick="onClick"
         />
 
     <Button
-        android:id="@+id/share_wechat_btn"
+        android:id="@+id/分享给微信好友"
         android:layout_width="180dp"
         android:layout_height="40dp"
         android:text="分享到微信"
+        android:onClick="onClick"
         />
 
     <Button
-        android:id="@+id/share_friends_btn"
+        android:id="@+id/分享到微信朋友圈"
         android:layout_width="180dp"
         android:layout_height="40dp"
         android:text="分享到微信朋友圈"
+        android:onClick="onClick"
         />
 
     <TextView
@@ -38,17 +41,19 @@
         />
 
     <Button
-        android:id="@+id/login_weibo_btn"
+        android:id="@+id/微博登录"
         android:layout_width="180dp"
         android:layout_height="40dp"
         android:text="微博登录"
+        android:onClick="onClick"
         />
 
     <Button
-        android:id="@+id/share_weibo_btn"
+        android:id="@+id/分享到微博"
         android:layout_width="180dp"
         android:layout_height="40dp"
         android:text="分享到微博"
+        android:onClick="onClick"
         />
 
     <TextView
@@ -58,24 +63,27 @@
         />
 
     <Button
-        android:id="@+id/login_qq_btn"
+        android:id="@+id/QQ登录"
         android:layout_width="180dp"
         android:layout_height="40dp"
         android:text="QQ登录"
+        android:onClick="onClick"
         />
 
     <Button
-        android:id="@+id/share_qZone_btn"
+        android:id="@+id/分享到QQ空间"
         android:layout_width="180dp"
         android:layout_height="40dp"
         android:text="分享到QQ空间"
+        android:onClick="onClick"
         />
 
     <Button
-        android:id="@+id/share_qq_friend_btn"
+        android:id="@+id/分享给QQ好友"
         android:layout_width="180dp"
         android:layout_height="40dp"
         android:text="分享给QQ好友"
+        android:onClick="onClick"
         />
 
 
@@ -109,11 +117,25 @@
             />
     </RadioGroup>
 
-    <TextView
-        android:id="@+id/userinfo_tv"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="name = jack"
-        />
-    
+        android:orientation="horizontal"
+        >
+
+        <TextView
+            android:id="@+id/userinfo_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="name = jack"
+            />
+
+        <ImageView
+            android:id="@+id/user_img_iv"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            />
+
+    </LinearLayout>
+
 </LinearLayout>
diff --git a/share/src/main/AndroidManifest.xml b/share/src/main/AndroidManifest.xml
index 3bd3ee7..d563d25 100644
--- a/share/src/main/AndroidManifest.xml
+++ b/share/src/main/AndroidManifest.xml
@@ -47,7 +47,14 @@
         <!-- ============================= qq ============================= -->
 
         <activity
-            android:name=".qq.SL_QQHandlerActivity"
+            android:name=".qq.SL_QQLoginActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            />
+        
+        <activity
+            android:name=".qq.SL_QQShareActivity"
             android:configChanges="keyboardHidden|orientation"
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
diff --git a/share/src/main/java/com/liulishuo/share/LoginManager.java b/share/src/main/java/com/liulishuo/share/LoginManager.java
new file mode 100644
index 0000000..9a180e4
--- /dev/null
+++ b/share/src/main/java/com/liulishuo/share/LoginManager.java
@@ -0,0 +1,264 @@
+package com.liulishuo.share;
+
+import com.liulishuo.share.model.AuthUserInfo;
+import com.liulishuo.share.qq.SL_QQLoginActivity;
+import com.liulishuo.share.type.LoginType;
+import com.liulishuo.share.util.HttpUtil;
+import com.liulishuo.share.weibo.SL_WeiBoLoginActivity;
+import com.liulishuo.share.weixin.WeiXinLoginManager;
+import com.sina.weibo.sdk.api.share.IWeiboShareAPI;
+import com.sina.weibo.sdk.api.share.WeiboShareSDK;
+import com.tencent.mm.sdk.openapi.IWXAPI;
+import com.tencent.mm.sdk.openapi.WXAPIFactory;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.widget.Toast;
+
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * @author Kale
+ * @date 2016/3/30
+ */
+public class LoginManager {
+
+    public static LoginListener listener;
+
+    public static void login(@NonNull Activity activity, @Nullable LoginListener listener, LoginType type) {
+        LoginManager.listener = listener;
+        switch (type) {
+            case WEIXIN:
+                if (!LoginManager.isWeiXinInstalled(activity)) {
+                    Toast.makeText(activity, "请安装微信哦~", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                new WeiXinLoginManager().login(activity.getApplicationContext());
+                break;
+            case WEIBO:
+                activity.startActivity(new Intent(activity, SL_WeiBoLoginActivity.class));
+                break;
+            case QQ:
+                if (!LoginManager.isQQInstalled(activity)) {
+                    Toast.makeText(activity, "请先安装QQ哦~", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                activity.startActivity(new Intent(activity, SL_QQLoginActivity.class));
+                break;
+        }
+    }
+
+    public static void getUserInfo(final @NonNull String accessToken, final @NonNull String uid,
+            @Nullable final UserInfoListener listener, LoginType type) {
+        switch (type) {
+            case WEIXIN:
+                getWeiXinUserInfo(accessToken, uid, listener);
+                break;
+            case WEIBO:
+                getWeiBoUserInfo(accessToken, uid, listener);
+                break;
+            case QQ:
+                getQQUserInfo(accessToken, uid, listener);
+                break;
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // 微信
+    ///////////////////////////////////////////////////////////////////////////
+
+    public static void getWeiXinUserInfo(@NonNull final String accessToken, @NonNull final String userId,
+            @Nullable final UserInfoListener listener) {
+
+        new AsyncTask<Void, Void, AuthUserInfo>() {
+
+            @Override
+            protected AuthUserInfo doInBackground(Void... params) {
+                String respStr = HttpUtil.doGet("https://api.weixin.qq.com/sns/userinfo"
+                        + "?access_token=" + accessToken + "&openid=" + userId);
+                if (respStr == null) {
+                    return null;
+                }
+
+                AuthUserInfo userInfo = null;
+                try {
+                    JSONObject jsonObject = new JSONObject(respStr);
+
+                    userInfo = new AuthUserInfo();
+                    userInfo.nickName = jsonObject.getString("nickname");
+                    userInfo.sex = jsonObject.getString("sex");
+                    userInfo.headImgUrl = jsonObject.getString("headimgurl");
+                    userInfo.userId = jsonObject.getString("unionid");
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                return userInfo;
+            }
+
+            @Override
+            protected void onPostExecute(AuthUserInfo userInfo) {
+                super.onPostExecute(userInfo);
+                if (listener != null) {
+                    if (userInfo != null) {
+                        listener.onSuccess(userInfo);
+                    } else {
+                        listener.onError("用户信息解析异常");
+                    }
+                }
+            }
+
+        }.execute();
+    }
+
+    /**
+     * @return 是否已经安装微信
+     */
+    public static boolean isWeiXinInstalled(Context context) {
+        IWXAPI api = WXAPIFactory.createWXAPI(context, ShareBlock.getInstance().weiXinAppId, true);
+        return api.isWXAppInstalled();
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    // 微博
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * 得到微博用户的信息
+     *
+     * @see "http://open.weibo.com/wiki/2/users/show"
+     */
+    public static void getWeiBoUserInfo(final @NonNull String accessToken, final @NonNull String uid,
+            @Nullable final UserInfoListener listener) {
+
+        new AsyncTask<Void, Void, AuthUserInfo>() {
+
+            @Override
+            protected AuthUserInfo doInBackground(Void... params) {
+                String respStr = HttpUtil.doGet("https://api.weibo.com/2/users/show.json"
+                        + "?access_token=" + accessToken + "&uid=" + uid);
+                if (respStr == null) {
+                    return null;
+                }
+
+                AuthUserInfo userInfo = null;
+                try {
+                    userInfo = new AuthUserInfo();
+                    JSONObject jsonObject = new JSONObject(respStr);
+                    userInfo.nickName = jsonObject.getString("screen_name");
+                    userInfo.sex = jsonObject.getString("gender");
+                    userInfo.headImgUrl = jsonObject.getString("avatar_large");
+                    userInfo.userId = jsonObject.getString("id");
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                return userInfo;
+            }
+
+            @Override
+            protected void onPostExecute(@Nullable AuthUserInfo userInfo) {
+                super.onPostExecute(userInfo);
+                if (listener != null) {
+                    if (userInfo != null) {
+                        listener.onSuccess(userInfo);
+                    } else {
+                        listener.onError("用户信息解析异常");
+                    }
+                }
+            }
+        }.execute();
+    }
+
+    public static boolean isWeiBoInstalled(@NonNull Context context) {
+        IWeiboShareAPI shareAPI = WeiboShareSDK.createWeiboAPI(context, ShareBlock.getInstance().weiBoAppId);
+        return shareAPI.isWeiboAppInstalled();
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    // QQ
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * 得到用户的信息，是一个静态的基础方法
+     *
+     * @see "http://wiki.open.qq.com/wiki/website/get_simple_userinfo"
+     */
+    public static void getQQUserInfo(@NonNull final String accessToken, @NonNull final String userId,
+            @Nullable final UserInfoListener listener) {
+
+        new AsyncTask<Void, Void, AuthUserInfo>() {
+
+            @Override
+            protected AuthUserInfo doInBackground(Void... params) {
+                String respStr = HttpUtil.doGet(
+                        "https://graph.qq.com/user/get_simple_userinfo"
+                                + "?access_token=" + accessToken
+                                + "&oauth_consumer_key=" + ShareBlock.getInstance().QQAppId
+                                + "&openid=" + userId
+                                + "&format=json");
+                if (respStr == null) {
+                    return null;
+                }
+
+                AuthUserInfo userInfo;
+                try {
+                    userInfo = new AuthUserInfo();
+                    JSONObject jsonObject = new JSONObject(respStr);
+                    userInfo.nickName = jsonObject.getString("nickname");
+                    userInfo.sex = jsonObject.getString("gender");
+                    userInfo.headImgUrl = jsonObject.getString("figureurl_qq_1");
+                    userInfo.userId = userId;
+                } catch (JSONException e) {
+                    userInfo = null;
+                    e.printStackTrace();
+                }
+                return userInfo;
+            }
+
+            @Override
+            protected void onPostExecute(AuthUserInfo userInfo) {
+                super.onPostExecute(userInfo);
+                if (listener != null) {
+                    if (userInfo != null) {
+                        listener.onSuccess(userInfo);
+                    } else {
+                        listener.onError("用户信息解析异常");
+                    }
+                }
+            }
+        }.execute();
+    }
+
+    public static boolean isQQInstalled(@NonNull Context context) {
+        PackageManager pm = context.getApplicationContext().getPackageManager();
+        if (pm == null) {
+            return false;
+        }
+        List<PackageInfo> packages = pm.getInstalledPackages(0);
+        for (PackageInfo info : packages) {
+            String name = info.packageName.toLowerCase(Locale.ENGLISH);
+            if ("com.tencent.mobileqq".equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public interface LoginListener {
+    
+        void onSuccess(String accessToken, String uId, long expiresIn, @Nullable String wholeData);
+    
+        void onError(String msg);
+    
+        void onCancel();
+    }
+}
diff --git a/share/src/main/java/com/liulishuo/share/ShareBlock.java b/share/src/main/java/com/liulishuo/share/ShareBlock.java
index 498da99..573aabf 100644
--- a/share/src/main/java/com/liulishuo/share/ShareBlock.java
+++ b/share/src/main/java/com/liulishuo/share/ShareBlock.java
@@ -1,51 +1,16 @@
 package com.liulishuo.share;
 
-import com.tencent.mm.sdk.modelmsg.SendMessageToWX;
-
 import android.app.Application;
-import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import java.io.File;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 
 /**
  * Created by echo on 5/18/15.
  */
 public class ShareBlock {
 
-    /**
-     * 发送给微信好友
-     */
-    public static final int WEIXIN_FRIEND = SendMessageToWX.Req.WXSceneSession;
-
-    /**
-     * 发送到朋友圈
-     */
-    public static final int WEIXIN_FRIEND_ZONE = SendMessageToWX.Req.WXSceneTimeline;
-
-    /**
-     * 发送到QQ空间
-     */
-    public static final int QQ_ZONE = 2;
-
-    /**
-     * 发送给QQ好友
-     */
-    public static final int QQ_FRIEND = 3;
-
-    /**
-     * 微博分享的类型（就一种，微博时间线）
-     */
-    public static final int WEIBO_TIME_LINE = 4;
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({WEIXIN_FRIEND, WEIXIN_FRIEND_ZONE, QQ_ZONE, QQ_FRIEND, WEIBO_TIME_LINE})
-    public @interface ShareType {
-    }
-
     private static ShareBlock mInstance;
 
     private ShareBlock() {
@@ -60,13 +25,27 @@ public static ShareBlock getInstance() {
 
     public String appName;
 
+    public String pathTemp = null;
+
+    public String weiXinAppId;
+
+    public String weiXinSecret;
+
+    public String weiBoAppId;
+
+    public String weiBoRedirectUrl;
+
+    public String weiBoScope;
+
+    public String QQAppId;
+
+    public String QQScope;
+
     public ShareBlock initAppName(@NonNull String appName) {
         this.appName = appName;
         return this;
     }
 
-    public String pathTemp = null;
-
     /**
      * 初始化临时文件地址
      */
@@ -83,42 +62,19 @@ public ShareBlock initSharePicFile(Application application) {
         return this;
     }
 
-    public String weiXinAppId;
-
-    public String weiXinSecret;
-
-    /**
-     * init wechat config
-     */
     public ShareBlock initWeiXin(@NonNull String weiXinAppId, @NonNull String weiXinSecret) {
         this.weiXinAppId = weiXinAppId;
         this.weiXinSecret = weiXinSecret;
         return this;
     }
 
-    /**
-     * init weibo config
-     */
-    public String weiboAppId;
-
-    public String weiboRedirectUrl;
-
-    public String weiboScope;
-
-    public ShareBlock initWeibo(@NonNull String weiboAppId, @NonNull String redirectUrl, @NonNull String scope) {
-        this.weiboAppId = weiboAppId;
-        weiboRedirectUrl = redirectUrl;
-        weiboScope = scope;
+    public ShareBlock initWeiBo(@NonNull String weiBoAppId, @NonNull String redirectUrl, @NonNull String scope) {
+        this.weiBoAppId = weiBoAppId;
+        weiBoRedirectUrl = redirectUrl;
+        weiBoScope = scope;
         return this;
     }
 
-    /**
-     * init QQ config
-     */
-    public String QQAppId;
-
-    public String QQScope;
-
     public ShareBlock initQQ(@NonNull String qqAppId, @NonNull String scope) {
         QQAppId = qqAppId;
         QQScope = scope;
diff --git a/share/src/main/java/com/liulishuo/share/ShareManager.java b/share/src/main/java/com/liulishuo/share/ShareManager.java
new file mode 100644
index 0000000..728cc76
--- /dev/null
+++ b/share/src/main/java/com/liulishuo/share/ShareManager.java
@@ -0,0 +1,104 @@
+package com.liulishuo.share;
+
+import com.liulishuo.share.model.shareContent.ShareContent;
+import com.liulishuo.share.qq.SL_QQShareActivity;
+import com.liulishuo.share.type.ShareType;
+import com.liulishuo.share.weibo.SL_WeiBoShareActivity;
+import com.liulishuo.share.weixin.WeiXinShareManager;
+import com.sina.weibo.sdk.api.share.IWeiboShareAPI;
+import com.sina.weibo.sdk.api.share.WeiboShareSDK;
+import com.tencent.mm.sdk.openapi.IWXAPI;
+import com.tencent.mm.sdk.openapi.WXAPIFactory;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.widget.Toast;
+
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * @author Kale
+ * @date 2016/3/30
+ */
+public class ShareManager {
+
+    public static final String KEY_CONTENT = "key_content";
+
+    public static ShareStateListener listener;
+
+    public static void share(@NonNull Activity activity, @NonNull ShareContent shareContent, ShareType shareType,
+            @Nullable final ShareStateListener listener) {
+        ShareManager.listener = listener;
+        switch (shareType) {
+            case QQ_FRIEND:
+            case QQ_ZONE:
+                if (!LoginManager.isQQInstalled(activity)) {
+                    Toast.makeText(activity, "请先安装QQ哦~", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                activity.startActivity(new Intent(activity, SL_QQShareActivity.class)
+                        .putExtra(SL_QQShareActivity.KEY_TO_FRIEND, shareType == ShareType.QQ_FRIEND)
+                        .putExtra(KEY_CONTENT, shareContent));
+                break;
+            case WEIBO_TIME_LINE:
+                if (!ShareManager.isWeiBoInstalled(activity)) {
+                    Toast.makeText(activity, "请先安装微博哦~", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                activity.startActivity(new Intent(activity, SL_WeiBoShareActivity.class)
+                        .putExtra(KEY_CONTENT, shareContent));
+                break;
+            case WEIXIN_FRIEND:
+            case WEIXIN_FRIEND_ZONE:
+                if (!LoginManager.isWeiXinInstalled(activity)) {
+                    Toast.makeText(activity, "请安装微信哦~", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                new WeiXinShareManager().sendShareMsg(activity.getApplicationContext(), shareContent, shareType);
+                break;
+        }
+    }
+
+    /**
+     * @return 是否已经安装微信
+     */
+    public static boolean isWeiXinInstalled(Context context) {
+        IWXAPI api = WXAPIFactory.createWXAPI(context, ShareBlock.getInstance().weiXinAppId, true);
+        return api.isWXAppInstalled();
+    }
+
+    public static boolean isWeiBoInstalled(@NonNull Context context) {
+        IWeiboShareAPI shareAPI = WeiboShareSDK.createWeiboAPI(context, ShareBlock.getInstance().weiBoAppId);
+        return shareAPI.isWeiboAppInstalled();
+    }
+
+    public static boolean isQQInstalled(@NonNull Context context) {
+        PackageManager pm = context.getApplicationContext().getPackageManager();
+        if (pm== null) {
+            return false;
+        }
+        List<PackageInfo> packages = pm.getInstalledPackages(0);
+        for (PackageInfo info : packages) {
+            String name = info.packageName.toLowerCase(Locale.ENGLISH);
+            if ("com.tencent.mobileqq".equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public interface ShareStateListener {
+    
+        void onSuccess();
+    
+        void onCancel();
+    
+        void onError(String msg);
+    }
+}
diff --git a/share/src/main/java/com/liulishuo/share/base/login/UserInfoListener.java b/share/src/main/java/com/liulishuo/share/UserInfoListener.java
similarity index 66%
rename from share/src/main/java/com/liulishuo/share/base/login/UserInfoListener.java
rename to share/src/main/java/com/liulishuo/share/UserInfoListener.java
index d45900a..8bd766b 100644
--- a/share/src/main/java/com/liulishuo/share/base/login/UserInfoListener.java
+++ b/share/src/main/java/com/liulishuo/share/UserInfoListener.java
@@ -1,6 +1,6 @@
-package com.liulishuo.share.base.login;
+package com.liulishuo.share;
 
-import com.liulishuo.share.base.AuthUserInfo;
+import com.liulishuo.share.model.AuthUserInfo;
 
 /**
  * @author Jack Tony
diff --git a/share/src/main/java/com/liulishuo/share/base/login/ILoginManager.java b/share/src/main/java/com/liulishuo/share/base/login/ILoginManager.java
deleted file mode 100644
index 0c5f380..0000000
--- a/share/src/main/java/com/liulishuo/share/base/login/ILoginManager.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.liulishuo.share.base.login;
-
-import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-/**
- * Created by echo on 5/21/15.
- */
-public interface ILoginManager {
-
-    void login(@NonNull Activity activity, @Nullable LoginListener listener);
-
-    void getUserInformation(@NonNull String accessToken, @NonNull String userId, @Nullable UserInfoListener listener);
-}
diff --git a/share/src/main/java/com/liulishuo/share/base/login/LoginListener.java b/share/src/main/java/com/liulishuo/share/base/login/LoginListener.java
deleted file mode 100644
index 2d2f24e..0000000
--- a/share/src/main/java/com/liulishuo/share/base/login/LoginListener.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.liulishuo.share.base.login;
-
-/**
- * @author Jack Tony
- * @date 2015/7/22
- */
-public interface LoginListener {
-
-    void onSuccess(String accessToken, String uId , long expiresIn, String wholeData);
-
-    void onError(String msg);
-
-    void onCancel();
-}
diff --git a/share/src/main/java/com/liulishuo/share/base/share/IShareManager.java b/share/src/main/java/com/liulishuo/share/base/share/IShareManager.java
deleted file mode 100644
index 2f78c0e..0000000
--- a/share/src/main/java/com/liulishuo/share/base/share/IShareManager.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.liulishuo.share.base.share;
-
-import com.liulishuo.share.ShareBlock;
-import com.liulishuo.share.base.shareContent.ShareContent;
-
-import android.app.Activity;
-
-/**
- * Created by echo on 5/21/15.
- */
-public interface IShareManager {
-
-    void share(Activity activity, ShareContent shareContent, @ShareBlock.ShareType int shareType, ShareStateListener listener);
-
-}
diff --git a/share/src/main/java/com/liulishuo/share/base/share/ShareStateListener.java b/share/src/main/java/com/liulishuo/share/base/share/ShareStateListener.java
deleted file mode 100644
index 354dafa..0000000
--- a/share/src/main/java/com/liulishuo/share/base/share/ShareStateListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.liulishuo.share.base.share;
-
-/**
- * Created by echo on 5/20/15.
- */
-public interface ShareStateListener {
-
-    /**
-     * 分享成功
-     */
-    void onSuccess();
-
-    void onCancel();
-
-    void onError(String msg);
-}
diff --git a/share/src/main/java/com/liulishuo/share/base/AuthUserInfo.java b/share/src/main/java/com/liulishuo/share/model/AuthUserInfo.java
similarity index 84%
rename from share/src/main/java/com/liulishuo/share/base/AuthUserInfo.java
rename to share/src/main/java/com/liulishuo/share/model/AuthUserInfo.java
index f386886..d3c01d5 100644
--- a/share/src/main/java/com/liulishuo/share/base/AuthUserInfo.java
+++ b/share/src/main/java/com/liulishuo/share/model/AuthUserInfo.java
@@ -1,4 +1,4 @@
-package com.liulishuo.share.base;
+package com.liulishuo.share.model;
 
 /**
  * @author Jack Tony
@@ -13,4 +13,4 @@ public class AuthUserInfo {
     public String headImgUrl;
     
     public String userId;
-}
+}
\ No newline at end of file
diff --git a/share/src/main/java/com/liulishuo/share/base/Constants.java b/share/src/main/java/com/liulishuo/share/model/Constants.java
similarity index 95%
rename from share/src/main/java/com/liulishuo/share/base/Constants.java
rename to share/src/main/java/com/liulishuo/share/model/Constants.java
index 72341fe..434e1f8 100644
--- a/share/src/main/java/com/liulishuo/share/base/Constants.java
+++ b/share/src/main/java/com/liulishuo/share/model/Constants.java
@@ -1,4 +1,4 @@
-package com.liulishuo.share.base;
+package com.liulishuo.share.model;
 
 /**
  * Created by echo on 5/18/15.
diff --git a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContent.java b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContent.java
similarity index 91%
rename from share/src/main/java/com/liulishuo/share/base/shareContent/ShareContent.java
rename to share/src/main/java/com/liulishuo/share/model/shareContent/ShareContent.java
index d12cc78..fcd34ca 100644
--- a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContent.java
+++ b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContent.java
@@ -1,4 +1,4 @@
-package com.liulishuo.share.base.shareContent;
+package com.liulishuo.share.model.shareContent;
 
 import android.os.Parcelable;
 
diff --git a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentMusic.java b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentMusic.java
similarity index 93%
rename from share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentMusic.java
rename to share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentMusic.java
index 9a474c2..9920651 100644
--- a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentMusic.java
+++ b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentMusic.java
@@ -1,6 +1,6 @@
-package com.liulishuo.share.base.shareContent;
+package com.liulishuo.share.model.shareContent;
 
-import com.liulishuo.share.base.Constants;
+import com.liulishuo.share.model.Constants;
 
 import android.graphics.Bitmap;
 import android.os.Parcel;
diff --git a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentPic.java b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentPic.java
similarity index 96%
rename from share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentPic.java
rename to share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentPic.java
index c574b6b..f722783 100644
--- a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentPic.java
+++ b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentPic.java
@@ -1,6 +1,6 @@
-package com.liulishuo.share.base.shareContent;
+package com.liulishuo.share.model.shareContent;
 
-import com.liulishuo.share.base.Constants;
+import com.liulishuo.share.model.Constants;
 
 import android.graphics.Bitmap;
 import android.os.Parcel;
diff --git a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentText.java b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentText.java
similarity index 94%
rename from share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentText.java
rename to share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentText.java
index 5e8eec8..faed5a0 100644
--- a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentText.java
+++ b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentText.java
@@ -1,6 +1,6 @@
-package com.liulishuo.share.base.shareContent;
+package com.liulishuo.share.model.shareContent;
 
-import com.liulishuo.share.base.Constants;
+import com.liulishuo.share.model.Constants;
 
 import android.os.Parcel;
 import android.support.annotation.NonNull;
diff --git a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentWebpage.java b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentWebpage.java
similarity index 95%
rename from share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentWebpage.java
rename to share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentWebpage.java
index 0e90881..e51123d 100644
--- a/share/src/main/java/com/liulishuo/share/base/shareContent/ShareContentWebpage.java
+++ b/share/src/main/java/com/liulishuo/share/model/shareContent/ShareContentWebpage.java
@@ -1,6 +1,6 @@
-package com.liulishuo.share.base.shareContent;
+package com.liulishuo.share.model.shareContent;
 
-import com.liulishuo.share.base.Constants;
+import com.liulishuo.share.model.Constants;
 
 import android.graphics.Bitmap;
 import android.os.Parcel;
diff --git a/share/src/main/java/com/liulishuo/share/qq/QQLoginManager.java b/share/src/main/java/com/liulishuo/share/qq/QQLoginManager.java
deleted file mode 100644
index d503765..0000000
--- a/share/src/main/java/com/liulishuo/share/qq/QQLoginManager.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.liulishuo.share.qq;
-
-import com.liulishuo.share.ShareBlock;
-import com.liulishuo.share.base.AuthUserInfo;
-import com.liulishuo.share.base.login.ILoginManager;
-import com.liulishuo.share.base.login.LoginListener;
-import com.liulishuo.share.base.login.UserInfoListener;
-import com.liulishuo.share.util.HttpUtil;
-import com.tencent.connect.common.Constants;
-import com.tencent.tauth.IUiListener;
-import com.tencent.tauth.Tencent;
-import com.tencent.tauth.UiError;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-
-/**
- * Created by echo on 5/19/15.
- */
-public class QQLoginManager implements ILoginManager {
-
-    private static IUiListener mUiListener;
-
-    @Override
-    public void login(@NonNull Activity activity, final @Nullable LoginListener loginListener) {
-        mUiListener = new IUiListener() {
-
-            @Override
-            public void onComplete(Object object) {
-                if (loginListener != null) {
-                    JSONObject jsonObject = ((JSONObject) object);
-                    try {
-                        String token = jsonObject.getString(Constants.PARAM_ACCESS_TOKEN);
-                        String openId = jsonObject.getString(Constants.PARAM_OPEN_ID);
-                        String expires = jsonObject.getString(Constants.PARAM_EXPIRES_IN);
-                        loginListener.onSuccess(token, openId, Long.valueOf(expires), object.toString());
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-
-            @Override
-            public void onError(UiError uiError) {
-                if (loginListener != null) {
-                    loginListener.onError(uiError.errorCode + " - " + uiError.errorMessage + " - " + uiError.errorDetail);
-                }
-            }
-
-            @Override
-            public void onCancel() {
-                if (loginListener != null) {
-                    loginListener.onCancel();
-                }
-            }
-        };
-        // 启动activity后，应该立刻调用{sendLoginMsg}方法
-        activity.startActivity(SL_QQHandlerActivity.withIntent(activity, true));
-    }
-
-    protected static void sendLoginMsg(Activity activity) {
-        String appId = ShareBlock.getInstance().QQAppId;
-        if (TextUtils.isEmpty(appId)) {
-            throw new NullPointerException("请通过shareBlock初始化appId");
-        }
-
-        Tencent tencent = Tencent.createInstance(appId, activity);
-        if (!tencent.isSessionValid()) {
-            tencent.login(activity, ShareBlock.getInstance().QQScope, mUiListener);
-        } else {
-            tencent.logout(activity);
-        }
-    }
-
-    /**
-     * 解析用户登录的结果
-     */
-    protected static void handlerOnActivityResult(int requestCode, int resultCode, Intent data) {
-        Tencent.onActivityResultData(requestCode, resultCode, data, mUiListener);
-    }
-
-    // ---------------------------------- 得到用户信息 -------------------------------------
-
-    @Override
-    public void getUserInformation(@NonNull String accessToken, @NonNull String userId, @Nullable UserInfoListener listener) {
-        getUserInfo(accessToken, userId, listener);
-    }
-
-    /**
-     * 得到用户的信息，是一个静态的基础方法
-     *
-     * @see "http://wiki.open.qq.com/wiki/website/get_simple_userinfo"
-     */
-    public static void getUserInfo(@NonNull final String accessToken, @NonNull final String userId,
-            @Nullable final UserInfoListener listener) {
-
-        new AsyncTask<Void, Void, AuthUserInfo>() {
-
-            @Override
-            protected AuthUserInfo doInBackground(Void... params) {
-                String respStr = HttpUtil.doGet(
-                        "https://graph.qq.com/user/get_simple_userinfo"
-                                + "?access_token=" + accessToken
-                                + "&oauth_consumer_key=" + ShareBlock.getInstance().QQAppId
-                                + "&openid=" + userId
-                                + "&format=json");
-                if (respStr == null) {
-                    return null;
-                }
-
-                AuthUserInfo userInfo;
-                try {
-                    userInfo = new AuthUserInfo();
-                    JSONObject jsonObject = new JSONObject(respStr);
-                    userInfo.nickName = jsonObject.getString("nickname");
-                    userInfo.sex = jsonObject.getString("gender");
-                    userInfo.headImgUrl = jsonObject.getString("figureurl_qq_1");
-                    userInfo.userId = userId;
-                } catch (JSONException e) {
-                    userInfo = null;
-                    e.printStackTrace();
-                }
-                return userInfo;
-            }
-
-            @Override
-            protected void onPostExecute(AuthUserInfo userInfo) {
-                super.onPostExecute(userInfo);
-                if (listener != null) {
-                    if (userInfo != null) {
-                        listener.onSuccess(userInfo);
-                    } else {
-                        listener.onError("用户信息解析异常");
-                    }
-                }
-            }
-        }.execute();
-    }
-
-}
-
-
diff --git a/share/src/main/java/com/liulishuo/share/qq/SL_QQHandlerActivity.java b/share/src/main/java/com/liulishuo/share/qq/SL_QQHandlerActivity.java
deleted file mode 100644
index ba5a1cc..0000000
--- a/share/src/main/java/com/liulishuo/share/qq/SL_QQHandlerActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.liulishuo.share.qq;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-/**
- * @author Jack Tony
- * @date 2015/10/26
- */
-public class SL_QQHandlerActivity extends Activity {
-
-    private static final String KEY_IS_LOGIN_REQ = "key_is_login_req";
-
-    public static Intent withIntent(Activity activity, boolean isLoginReq) {
-        return new Intent(activity, SL_QQHandlerActivity.class)
-                .putExtra(KEY_IS_LOGIN_REQ, isLoginReq);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (savedInstanceState == null) { // 防止不保留活动情况下activity被重置后直接进行操作的情况
-            if (getIntent().getBooleanExtra(KEY_IS_LOGIN_REQ, true)) {
-                QQLoginManager.sendLoginMsg(this);
-            } else {
-                QQShareManager.sendShareMsg(this, getIntent().getExtras());
-            }
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        Log.d("SL_QQHandlerActivity", "onActivityResult: reqCode = " + requestCode + " resCode = " + resultCode);
-        /**
-         * 11101 instead {@link com.tencent.tauth.Tencent#REQUEST_LOGIN}
-         */
-        if (requestCode == 11101) {
-            QQLoginManager.handlerOnActivityResult(requestCode, resultCode, data);
-        } else {
-            QQShareManager.handlerOnActivityResult(data);
-        }
-        finish();
-    }
-}
diff --git a/share/src/main/java/com/liulishuo/share/qq/SL_QQLoginActivity.java b/share/src/main/java/com/liulishuo/share/qq/SL_QQLoginActivity.java
new file mode 100644
index 0000000..e5ba93e
--- /dev/null
+++ b/share/src/main/java/com/liulishuo/share/qq/SL_QQLoginActivity.java
@@ -0,0 +1,88 @@
+package com.liulishuo.share.qq;
+
+import com.liulishuo.share.LoginManager;
+import com.liulishuo.share.ShareBlock;
+import com.tencent.connect.common.Constants;
+import com.tencent.tauth.IUiListener;
+import com.tencent.tauth.Tencent;
+import com.tencent.tauth.UiError;
+
+import org.json.JSONObject;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+/**
+ * @author Jack Tony
+ * @date 2015/10/26
+ */
+public class SL_QQLoginActivity extends Activity {
+
+    private IUiListener mUiListener;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (savedInstanceState == null) { // 防止不保留活动情况下activity被重置后直接进行操作的情况
+            doLogin(this, LoginManager.listener);
+        }
+    }
+    
+    /**
+     * 解析用户登录的结果
+     */
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Tencent.onActivityResultData(requestCode, resultCode, data, mUiListener);
+        finish();
+    }
+
+    private void doLogin(Activity activity,final LoginManager.LoginListener listener) {
+        String appId = ShareBlock.getInstance().QQAppId;
+        if (TextUtils.isEmpty(appId)) {
+            throw new NullPointerException("请通过shareBlock初始化appId");
+        }
+        Tencent tencent = Tencent.createInstance(appId, activity);
+
+        mUiListener = new IUiListener() {
+
+            @Override
+            public void onComplete(Object object) {
+                if (listener != null) {
+                    JSONObject jsonObject = ((JSONObject) object);
+                    try {
+                        String token = jsonObject.getString(Constants.PARAM_ACCESS_TOKEN);
+                        String openId = jsonObject.getString(Constants.PARAM_OPEN_ID);
+                        String expires = jsonObject.getString(Constants.PARAM_EXPIRES_IN);
+                        listener.onSuccess(token, openId, Long.valueOf(expires), object.toString());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+            @Override
+            public void onError(UiError uiError) {
+                if (listener != null) {
+                    listener.onError(uiError.errorCode + " - " + uiError.errorMessage + " - " + uiError.errorDetail);
+                }
+            }
+
+            @Override
+            public void onCancel() {
+                if (listener != null) {
+                    listener.onCancel();
+                }
+            }
+        };
+
+        if (!tencent.isSessionValid()) {
+            tencent.login(activity, ShareBlock.getInstance().QQScope, mUiListener);
+        } else {
+            tencent.logout(activity);
+        }
+    }
+}
diff --git a/share/src/main/java/com/liulishuo/share/qq/QQShareManager.java b/share/src/main/java/com/liulishuo/share/qq/SL_QQShareActivity.java
similarity index 74%
rename from share/src/main/java/com/liulishuo/share/qq/QQShareManager.java
rename to share/src/main/java/com/liulishuo/share/qq/SL_QQShareActivity.java
index d17823b..995123b 100644
--- a/share/src/main/java/com/liulishuo/share/qq/QQShareManager.java
+++ b/share/src/main/java/com/liulishuo/share/qq/SL_QQShareActivity.java
@@ -1,10 +1,9 @@
 package com.liulishuo.share.qq;
 
 import com.liulishuo.share.ShareBlock;
-import com.liulishuo.share.base.Constants;
-import com.liulishuo.share.base.share.IShareManager;
-import com.liulishuo.share.base.share.ShareStateListener;
-import com.liulishuo.share.base.shareContent.ShareContent;
+import com.liulishuo.share.ShareManager;
+import com.liulishuo.share.model.Constants;
+import com.liulishuo.share.model.shareContent.ShareContent;
 import com.tencent.connect.share.QQShare;
 import com.tencent.connect.share.QzoneShare;
 import com.tencent.tauth.IUiListener;
@@ -15,9 +14,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.widget.Toast;
+import android.util.Log;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -27,22 +25,61 @@
 import static com.liulishuo.share.ShareBlock.getInstance;
 
 /**
- * Created by echo on 5/18/15.
+ * @author Jack Tony
+ * @date 2015/10/26
  */
-public class QQShareManager implements IShareManager {
+public class SL_QQShareActivity extends Activity {
 
-    private static final String KEY_SHARE_TO_FRIEND = "key_share_to_friend";
+    private static final String TAG = "SL_QQShareActivity";
 
-    private static IUiListener mUiListener;
+    public static final String KEY_TO_FRIEND = "key_to_friend";
 
+    private boolean isToFriend;
+
+    private IUiListener uiListener;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // 无论是否是恢复的activity，都要先初始化监听器，否则开启不保留活动后监听器对象就是null
+        uiListener = initListener(ShareManager.listener);
+        isToFriend = getIntent().getBooleanExtra(KEY_TO_FRIEND, true);
+        
+        if (savedInstanceState == null) { // 防止不保留活动情况下activity被重置后直接进行操作的情况
+            ShareContent shareContent = getIntent().getParcelableExtra(ShareManager.KEY_CONTENT);
+            share(shareContent);
+        }
+    }
+    
     /**
-     * 启动新的activity进行分享
+     * 解析分享的结果
      */
     @Override
-    public void share(@NonNull Activity activity, @NonNull ShareContent shareContent, @ShareBlock.ShareType int shareType,
-            @Nullable final ShareStateListener listener) {
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (uiListener != null && data != null) {
+            Tencent.handleResultData(data, uiListener);
+        }
+        finish();
+    }
+
+    private void share(ShareContent shareContent) {
+        String appId = ShareBlock.getInstance().QQAppId;
+        if (TextUtils.isEmpty(appId)) {
+            throw new NullPointerException("请通过shareBlock初始化QQAppId");
+        }
+        Tencent tencent = Tencent.createInstance(appId, getApplicationContext());
+        if (isToFriend) {
+            Bundle params = getShareToQQBundle(shareContent);
+            tencent.shareToQQ(this, params, uiListener);
+        } else {
+            Bundle params = getShareToQZoneBundle(shareContent);
+            tencent.shareToQzone(this, params, uiListener);
+        }
+    }
 
-        mUiListener = new IUiListener() {
+    private IUiListener initListener(final ShareManager.ShareStateListener listener) {
+        return new IUiListener() {
 
             @Override
             public void onComplete(Object response) {
@@ -65,53 +102,18 @@ public void onError(UiError e) {
                 }
             }
         };
-
-        Bundle params = null;
-        if (shareType == ShareBlock.QQ_FRIEND) {
-            params = getShareToQQBundle(activity, shareContent);
-            params.putBoolean(KEY_SHARE_TO_FRIEND, true);
-        } else if (shareType == ShareBlock.QQ_ZONE) {
-            params = getShareToQZoneBundle(activity, shareContent);
-            params.putBoolean(KEY_SHARE_TO_FRIEND, false);
-        }
-        activity.startActivity(SL_QQHandlerActivity.withIntent(activity, false).putExtras(params));
-    }
-
-    /**
-     * 启动的activity调用此方法进行分享
-     */
-    protected static void sendShareMsg(Activity activity, Bundle params) {
-        String appId = ShareBlock.getInstance().QQAppId;
-        if (TextUtils.isEmpty(appId)) {
-            throw new NullPointerException("请通过shareBlock初始化QQAppId");
-        }
-
-        Tencent tencent = Tencent.createInstance(appId, activity);
-        if (params.getBoolean(KEY_SHARE_TO_FRIEND)) {
-            tencent.shareToQQ(activity, params, mUiListener);
-        } else {
-            tencent.shareToQzone(activity, params, mUiListener);
-        }
     }
 
-    /**
-     * 解析分享的结果
-     */
-    protected static void handlerOnActivityResult(Intent data) {
-        if (mUiListener != null && data != null) {
-            Tencent.handleResultData(data, mUiListener);
-        }
-    }
-
-    // --------------------------
-
-    private @NonNull Bundle getShareToQQBundle(Activity activity, ShareContent shareContent) {
+    private
+    @NonNull
+    Bundle getShareToQQBundle(ShareContent shareContent) {
         Bundle bundle;
         switch (shareContent.getType()) {
             case Constants.SHARE_TYPE_TEXT:
                 // 纯文字
-                // FIXME: 2015/10/23 文档中说： "本接口支持3种模式，每种模式的参数设置不同"，这三种模式中不包含纯文本
-                Toast.makeText(activity, "QQ目前不支持分享纯文本信息", Toast.LENGTH_SHORT).show();
+                // 文档中说： "本接口支持3种模式，每种模式的参数设置不同"，这三种模式中不包含纯文本
+                Log.e(TAG, "QQ目前不支持分享纯文本信息");
+                finish();
                 bundle = getTextObj();
                 break;
             case Constants.SHARE_TYPE_PIC:
@@ -193,25 +195,21 @@ private Bundle getMusicObj(ShareContent shareContent) {
      * QzoneShare.SHARE_TO_QQ_KEY_TYPE 	    选填      Int 	SHARE_TO_QZONE_TYPE_IMAGE_TEXT（图文）
      * QzoneShare.SHARE_TO_QQ_TITLE 	    必填      Int 	分享的标题，最多200个字符。
      * QzoneShare.SHARE_TO_QQ_SUMMARY 	    选填      String 	分享的摘要，最多600字符。
-     * QzoneShare.SHARE_TO_QQ_TARGET_URL    必填      String 	需要跳转的链接，URL字符串。
-     * QzoneShare.SHARE_TO_QQ_IMAGE_URL     选填      String
+     * QzoneShare.SHARE_TO_QQ_TARGET_URL    必填      String 	跳转URL，URL字符串。
+     * QzoneShare.SHARE_TO_QQ_IMAGE_URL     选填      String     图片链接ArrayList
      *
      * 注意:QZone接口暂不支持发送多张图片的能力，若传入多张图片，则会自动选入第一张图片作为预览图。多图的能力将会在以后支持。
      *
      * 如果分享的图片url是本地的图片地址那么在分享时会显示图片，如果分享的是图片的网址，那么就不会在分享时显示图片
      */
-    private Bundle getShareToQZoneBundle(Activity activity, ShareContent shareContent) {
-        /*params.putString(QzoneShare.SHARE_TO_QQ_KEY_TYPE,SHARE_TO_QZONE_TYPE_IMAGE_TEXT );
-        params.putString(QzoneShare.SHARE_TO_QQ_TITLE, "标题");//必填
-        params.putString(QzoneShare.SHARE_TO_QQ_SUMMARY, "摘要");//选填
-        params.putString(QzoneShare.SHARE_TO_QQ_TARGET_URL, "跳转URL");//必填
-        params.putStringArrayList(QzoneShare.SHARE_TO_QQ_IMAGE_URL, "图片链接ArrayList");*/
+    private Bundle getShareToQZoneBundle(ShareContent shareContent) {
         Bundle params = new Bundle();
         params.putInt(QzoneShare.SHARE_TO_QZONE_KEY_TYPE, QzoneShare.SHARE_TO_QZONE_TYPE_IMAGE_TEXT);
         String title = shareContent.getTitle();
         if (title == null) {
             // 如果没title，说明就是分享的纯文字、纯图片
-            Toast.makeText(activity, "QQ空间目前只支持分享图文信息", Toast.LENGTH_SHORT).show();
+            Log.e(TAG, "QQ空间目前只支持分享图文信息");
+            finish();
         }
         params.putString(QzoneShare.SHARE_TO_QQ_TITLE, title); // 标题
         params.putString(QzoneShare.SHARE_TO_QQ_SUMMARY, shareContent.getSummary()); // 描述
@@ -230,7 +228,7 @@ private String saveByteArr(@NonNull byte[] bytes) {
         if (getInstance().pathTemp == null) {
             throw new NullPointerException("请先调用shareBlock的initSharePicFile(Application application)方法");
         }
-        
+
         String imagePath = getInstance().pathTemp + File.separator + "sharePic_temp.png";
         try {
             FileOutputStream fos = new FileOutputStream(imagePath);
@@ -241,5 +239,4 @@ private String saveByteArr(@NonNull byte[] bytes) {
         }
         return imagePath;
     }
-
 }
diff --git a/share/src/main/java/com/liulishuo/share/type/LoginType.java b/share/src/main/java/com/liulishuo/share/type/LoginType.java
new file mode 100644
index 0000000..1c79cb8
--- /dev/null
+++ b/share/src/main/java/com/liulishuo/share/type/LoginType.java
@@ -0,0 +1,9 @@
+package com.liulishuo.share.type;
+
+/**
+ * @author Kale
+ * @date 2016/3/30
+ */
+public enum LoginType {
+    WEIXIN,WEIBO,QQ
+}
diff --git a/share/src/main/java/com/liulishuo/share/type/ShareType.java b/share/src/main/java/com/liulishuo/share/type/ShareType.java
new file mode 100644
index 0000000..2e34bf0
--- /dev/null
+++ b/share/src/main/java/com/liulishuo/share/type/ShareType.java
@@ -0,0 +1,13 @@
+package com.liulishuo.share.type;
+
+/**
+ * @author Kale
+ * @date 2016/3/30
+ */
+public enum ShareType {
+    WEIXIN_FRIEND, 
+    WEIXIN_FRIEND_ZONE, 
+    WEIBO_TIME_LINE, // 微博分享的类型（就一种，微博时间线）
+    QQ_ZONE,
+    QQ_FRIEND
+}
\ No newline at end of file
diff --git a/share/src/main/java/com/liulishuo/share/weibo/AccessTokenKeeper.java b/share/src/main/java/com/liulishuo/share/util/AccessTokenKeeper.java
similarity index 93%
rename from share/src/main/java/com/liulishuo/share/weibo/AccessTokenKeeper.java
rename to share/src/main/java/com/liulishuo/share/util/AccessTokenKeeper.java
index ec53f27..0810d5e 100644
--- a/share/src/main/java/com/liulishuo/share/weibo/AccessTokenKeeper.java
+++ b/share/src/main/java/com/liulishuo/share/util/AccessTokenKeeper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.liulishuo.share.weibo;
+package com.liulishuo.share.util;
 
 
 import com.sina.weibo.sdk.auth.Oauth2AccessToken;
@@ -29,7 +29,7 @@
  * @author SINA
  * @since 2013-10-07
  */
-class AccessTokenKeeper {
+public class AccessTokenKeeper {
     private static final String PREFERENCES_NAME = "com_weibo_sdk_android";
     private static final String KEY_UID = "uid";
     private static final String KEY_ACCESS_TOKEN = "access_token";
@@ -41,7 +41,7 @@ class AccessTokenKeeper {
      * @param context 应用程序上下文环境
      * @param token   Token 对象
      */
-    protected static void writeAccessToken(Context context, Oauth2AccessToken token) {
+    public static void writeAccessToken(Context context, Oauth2AccessToken token) {
         if (null == context || null == token) {
             return;
         }
@@ -76,7 +76,7 @@ protected static Oauth2AccessToken readAccessToken(Context context) {
      *
      * @param context 应用程序上下文环境
      */
-    protected static void clear(Context context) {
+    public static void clear(Context context) {
         if (null == context) {
             return;
         }
diff --git a/share/src/main/java/com/liulishuo/share/weibo/SL_WeiBoLoginActivity.java b/share/src/main/java/com/liulishuo/share/weibo/SL_WeiBoLoginActivity.java
index 4c006df..8fe8cec 100644
--- a/share/src/main/java/com/liulishuo/share/weibo/SL_WeiBoLoginActivity.java
+++ b/share/src/main/java/com/liulishuo/share/weibo/SL_WeiBoLoginActivity.java
@@ -1,8 +1,23 @@
 package com.liulishuo.share.weibo;
 
+import com.liulishuo.share.ShareBlock;
+import com.liulishuo.share.LoginManager;
+import com.liulishuo.share.util.AccessTokenKeeper;
+import com.sina.weibo.sdk.auth.AuthInfo;
+import com.sina.weibo.sdk.auth.Oauth2AccessToken;
+import com.sina.weibo.sdk.auth.WeiboAuthListener;
+import com.sina.weibo.sdk.auth.sso.SsoHandler;
+import com.sina.weibo.sdk.exception.WeiboException;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
 
 /**
  * @author Jack Tony
@@ -10,33 +25,112 @@
  */
 public class SL_WeiBoLoginActivity extends Activity {
 
+    /**
+     * 注意：SsoHandler 仅当 SDK 支持 SSO 时有效
+     */
+    private SsoHandler ssoHandler;
+
     private boolean isFirstIn = true;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        ssoHandler = initHandler(this);
         if (savedInstanceState == null) {
             // 防止不保留活动情况下activity被重置后直接进行操作的情况
-            WeiboLoginManager.sendLoginMsg(this);
+            doLogin(this, LoginManager.listener);
         } else {
             isFirstIn = false;
         }
     }
 
+    /**
+     * 解析用户登录的结果
+     * SSO 授权回调   重要：发起 SSO 登陆的 Activity 必须重写 onActivityResult
+     */
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        WeiboLoginManager.handlerOnActivityResult(requestCode, resultCode, data);
+        if (ssoHandler != null) {
+            ssoHandler.authorizeCallBack(requestCode, resultCode, data);
+        }
         finish();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        if (isFirstIn) {
-            isFirstIn = false;
-        } else {
+        if (!isFirstIn) {
             // 这里处理通过网页登录无回调的问题
             finish();
         }
     }
+
+    private void doLogin(final Activity activity, final LoginManager.LoginListener listener) {
+        WeiboAuthListener authListener = new WeiboAuthListener() {
+            /*
+             * 1. SSO 授权时，需要在 onActivityResult 中调用 {@link SsoHandler#authorizeCallBack} 后，
+             * 该回调才会被执行。
+             * 2. 非SSO 授权时，当授权结束后，该回调就会被执行
+             */
+            @Override
+            public void onComplete(Bundle values) {
+                final Oauth2AccessToken accessToken = Oauth2AccessToken.parseAccessToken(values);
+                if (accessToken != null && accessToken.isSessionValid()) {
+                    AccessTokenKeeper.writeAccessToken(activity, accessToken);
+                    if (listener != null) {
+                        listener.onSuccess(accessToken.getToken(),
+                                accessToken.getUid(),
+                                accessToken.getExpiresTime() / 1000000,
+                                oAuthData2Json(accessToken));
+                    }
+                }
+            }
+
+            @Override
+            public void onWeiboException(WeiboException e) {
+                if (listener != null) {
+                    listener.onError(e.getMessage());
+                }
+            }
+
+            @Override
+            public void onCancel() {
+                if (listener != null) {
+                    listener.onCancel();
+                }
+            }
+        };
+
+        ssoHandler.authorize(authListener); // 启动微博的activity进行微博登录
+    }
+
+    private SsoHandler initHandler(Activity activity) {
+        String appId = ShareBlock.getInstance().weiBoAppId;
+        if (TextUtils.isEmpty(appId)) {
+            throw new NullPointerException("请通过shareBlock初始化weiboAppId");
+        }
+
+        AccessTokenKeeper.clear(activity);
+        AuthInfo authInfo = new AuthInfo(activity, appId,
+                ShareBlock.getInstance().weiBoRedirectUrl,
+                ShareBlock.getInstance().weiBoScope);
+
+        return new SsoHandler(activity, authInfo);
+    }
+
+    private
+    @Nullable
+    String oAuthData2Json(@NonNull Oauth2AccessToken data) {
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("uid", data.getUid());
+            jsonObject.put("refresh_token", data.getRefreshToken());
+            jsonObject.put("access_token", data.getToken());
+            jsonObject.put("expires_in", String.valueOf(data.getExpiresTime() / 1000000));
+            return jsonObject.toString();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }
diff --git a/share/src/main/java/com/liulishuo/share/weibo/SL_WeiBoShareActivity.java b/share/src/main/java/com/liulishuo/share/weibo/SL_WeiBoShareActivity.java
index e1c7b6a..8a1f91d 100644
--- a/share/src/main/java/com/liulishuo/share/weibo/SL_WeiBoShareActivity.java
+++ b/share/src/main/java/com/liulishuo/share/weibo/SL_WeiBoShareActivity.java
@@ -1,16 +1,28 @@
 package com.liulishuo.share.weibo;
 
 import com.liulishuo.share.ShareBlock;
+import com.liulishuo.share.ShareManager;
+import com.liulishuo.share.model.Constants;
+import com.liulishuo.share.model.shareContent.ShareContent;
+import com.sina.weibo.sdk.api.ImageObject;
+import com.sina.weibo.sdk.api.MusicObject;
+import com.sina.weibo.sdk.api.TextObject;
+import com.sina.weibo.sdk.api.VideoObject;
+import com.sina.weibo.sdk.api.WebpageObject;
+import com.sina.weibo.sdk.api.WeiboMultiMessage;
 import com.sina.weibo.sdk.api.share.BaseResponse;
 import com.sina.weibo.sdk.api.share.IWeiboHandler;
 import com.sina.weibo.sdk.api.share.IWeiboShareAPI;
+import com.sina.weibo.sdk.api.share.SendMultiMessageToWeiboRequest;
 import com.sina.weibo.sdk.api.share.WeiboShareSDK;
 import com.sina.weibo.sdk.constant.WBConstants;
+import com.sina.weibo.sdk.utils.Utility;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.widget.Toast;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
 
 /**
  * @author Jack Tony
@@ -20,21 +32,21 @@ public class SL_WeiBoShareActivity extends Activity implements IWeiboHandler.Res
 
     private boolean isFirstIn = true;
 
+    private SendMultiMessageToWeiboRequest request;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState == null) {
             // 防止不保留活动情况下activity被重置后直接进行操作的情况
-            
-            if (!WeiboShareManager.isWeiBoInstalled(this)) {
-                Toast.makeText(getApplicationContext(), "请先安装微博", Toast.LENGTH_SHORT).show();
-                finish();
-                return;
-            }
-            
-            WeiboShareManager.sendShareMsg(this);
+            // 建立请求体
+            request = new SendMultiMessageToWeiboRequest();
+            request.transaction = buildTransaction("tag");// 用transaction唯一标识一个请求
+            ShareContent content = getIntent().getParcelableExtra(ShareManager.KEY_CONTENT);
+            request.multiMessage = getShareObject(content);
+
+            sendShareMsg(this);
         } else {
-            isFirstIn = false;
             /**
              * 当 Activity 被重新初始化时（该 Activity 处于后台时，可能会由于内存不足被杀掉了），
              * 需要调用 {@link IWeiboShareAPI#handleWeiboResponse} 来接收微博客户端返回的数据。
@@ -42,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
              * 失败返回 false，不调用上述回调
              */
             IWeiboShareAPI API = WeiboShareSDK.createWeiboAPI(getApplicationContext(),
-                    ShareBlock.getInstance().weiboAppId);
+                    ShareBlock.getInstance().weiBoAppId);
             API.handleWeiboResponse(getIntent(), this);
         }
     }
@@ -58,27 +70,189 @@ protected void onResume() {
             isFirstIn = false;
         } else {
             // 这里处理保存到草稿箱的逻辑
-            WeiboShareManager.parseShareResp(WBConstants.ErrorCode.ERR_CANCEL, "weibo cancel");
-            finish();
+            parseShareResp(WBConstants.ErrorCode.ERR_CANCEL, "weibo cancel");
         }
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        /** 
+        /**
          * 从当前应用唤起微博并进行分享后，返回到当前应用时，需要在此处调用该函数
          * 来接收微博客户端返回的数据；执行成功，返回 true，并调用
          * {@link IWeiboHandler.Response#onResponse}；失败返回 false，不调用上述回调
          */
-        IWeiboShareAPI API = WeiboShareSDK.createWeiboAPI(getApplicationContext(), ShareBlock.getInstance().weiboAppId);
+        IWeiboShareAPI API = WeiboShareSDK.createWeiboAPI(getApplicationContext(), ShareBlock.getInstance().weiBoAppId);
         API.handleWeiboResponse(intent, this); // 当前应用唤起微博分享后，返回当前应用
     }
 
     @Override
     public void onResponse(BaseResponse baseResponse) {
-        WeiboShareManager.parseShareResp(baseResponse.errCode, baseResponse.errMsg);
+        parseShareResp(baseResponse.errCode, baseResponse.errMsg);
+    }
+
+    protected void sendShareMsg(Activity activity) {
+        String appId = ShareBlock.getInstance().weiBoAppId;
+        if (TextUtils.isEmpty(appId)) {
+            throw new NullPointerException("请通过shareBlock初始化weiboAppId");
+        }
+        IWeiboShareAPI api = WeiboShareSDK.createWeiboAPI(activity, appId);
+        api.registerApp();  // 将应用注册到微博客户端
+        api.sendRequest(activity, request);
+    }
+
+    /**
+     * 处理分享的回调
+     */
+    protected void parseShareResp(int respCode, String errorMsg) {
+        ShareManager.ShareStateListener listener = ShareManager.listener;
+        if (listener == null) {
+            return;
+        }
+
+        switch (respCode) {
+            case WBConstants.ErrorCode.ERR_OK:
+                listener.onSuccess();
+                break;
+
+            case WBConstants.ErrorCode.ERR_CANCEL:
+                listener.onCancel();
+                break;
+
+            case WBConstants.ErrorCode.ERR_FAIL:
+                listener.onError(errorMsg);
+                break;
+            default:
+                listener.onError("未知错误");
+        }
         finish();
     }
 
+    // --------------------------
+
+    private WeiboMultiMessage getShareObject(@NonNull ShareContent shareContent) {
+        WeiboMultiMessage weiboMultiMessage = new WeiboMultiMessage();
+        switch (shareContent.getType()) {
+            case Constants.SHARE_TYPE_TEXT:
+                // 纯文字
+                weiboMultiMessage.textObject = getTextObj(shareContent.getSummary());
+                break;
+            case Constants.SHARE_TYPE_PIC:
+                // 纯图片
+                weiboMultiMessage.imageObject = getImageObj(shareContent);
+                break;
+            case Constants.SHARE_TYPE_WEBPAGE:
+                // 网页
+                if (shareContent.getURL() == null) {
+                    weiboMultiMessage.imageObject = getImageObj(shareContent);
+                    weiboMultiMessage.textObject = getTextObj(shareContent.getSummary());
+                } else {
+                    weiboMultiMessage.mediaObject = getWebPageObj(shareContent);
+                }
+                break;
+            case Constants.SHARE_TYPE_MUSIC:
+                // 音乐
+                weiboMultiMessage.mediaObject = getMusicObj(shareContent);
+                break;
+            default:
+                throw new UnsupportedOperationException("不支持的分享内容");
+        }
+        if (!weiboMultiMessage.checkArgs()) {
+            throw new IllegalArgumentException("分享信息的参数类型不正确");
+        }
+        return weiboMultiMessage;
+    }
+
+    /**
+     * 创建文本消息对象。
+     *
+     * @return 文本消息对象。
+     */
+    private TextObject getTextObj(String text) {
+        TextObject textObject = new TextObject();
+        textObject.text = text;
+        return textObject;
+    }
+
+    /**
+     * 创建图片消息对象。
+     *
+     * @return 图片消息对象。
+     */
+    private ImageObject getImageObj(ShareContent shareContent) {
+        byte[] bmpBytes = shareContent.getImageBmpBytes();
+        if (bmpBytes != null) {
+            ImageObject imageObject = new ImageObject();
+            imageObject.imageData = bmpBytes;
+            return imageObject;
+        }
+        return null;
+    }
+
+    /**
+     * 创建多媒体（网页）消息对象。
+     *
+     * @return 多媒体（网页）消息对象。
+     */
+    private WebpageObject getWebPageObj(ShareContent shareContent) {
+        WebpageObject mediaObject = new WebpageObject();
+        mediaObject.identify = Utility.generateGUID();
+        mediaObject.title = shareContent.getTitle();
+        mediaObject.description = shareContent.getSummary();
+        // 设置 Bitmap 类型的图片到视频对象里        
+        // 设置缩略图。 注意：最终压缩过的缩略图大小不得超过 32kb。
+        mediaObject.thumbData = shareContent.getImageBmpBytes();
+        mediaObject.actionUrl = shareContent.getURL();
+        mediaObject.defaultText = shareContent.getSummary();
+        return mediaObject;
+    }
+
+    /**
+     * 创建多媒体（音乐）消息对象。
+     *
+     * @return 多媒体（音乐）消息对象。
+     */
+    private MusicObject getMusicObj(ShareContent shareContent) {
+        // 创建媒体消息
+        MusicObject musicObject = new MusicObject();
+        musicObject.identify = Utility.generateGUID();
+        musicObject.title = shareContent.getTitle();
+        musicObject.description = shareContent.getSummary();
+        // 设置 Bitmap 类型的图片到视频对象里        
+        // 设置缩略图。 注意：最终压缩过的缩略图大小不得超过 32kb。
+        musicObject.thumbData = shareContent.getImageBmpBytes();
+        musicObject.actionUrl = shareContent.getMusicUrl();
+        musicObject.dataUrl = ShareBlock.getInstance().weiBoRedirectUrl;
+        musicObject.dataHdUrl = ShareBlock.getInstance().weiBoRedirectUrl;
+        musicObject.duration = 10;
+        musicObject.defaultText = shareContent.getSummary();
+        return musicObject;
+    }
+
+    /**
+     * 创建多媒体（视频）消息对象。
+     *
+     * @return 多媒体（视频）消息对象。
+     */
+    private VideoObject getVideoObj(ShareContent shareContent) {
+        VideoObject videoObject = new VideoObject();
+        videoObject.identify = Utility.generateGUID();
+        videoObject.title = shareContent.getTitle();
+        videoObject.description = shareContent.getSummary();
+        // 设置 Bitmap 类型的图片到视频对象里        
+        // 设置缩略图。 注意：最终压缩过的缩略图大小不得超过 32kb。
+        videoObject.thumbData = shareContent.getImageBmpBytes();
+        videoObject.actionUrl = shareContent.getURL();
+        videoObject.dataUrl = ShareBlock.getInstance().weiBoRedirectUrl;
+        videoObject.dataHdUrl = ShareBlock.getInstance().weiBoRedirectUrl;
+        videoObject.duration = 10;
+        videoObject.defaultText = shareContent.getSummary(); // 默认文案
+        return videoObject;
+    }
+
+    public static String buildTransaction(final String type) {
+        return (type == null) ? String.valueOf(System.currentTimeMillis())
+                : type + System.currentTimeMillis();
+    }
+
 }
diff --git a/share/src/main/java/com/liulishuo/share/weibo/WeiboLoginManager.java b/share/src/main/java/com/liulishuo/share/weibo/WeiboLoginManager.java
deleted file mode 100644
index 96bbd5b..0000000
--- a/share/src/main/java/com/liulishuo/share/weibo/WeiboLoginManager.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.liulishuo.share.weibo;
-
-import com.liulishuo.share.ShareBlock;
-import com.liulishuo.share.base.AuthUserInfo;
-import com.liulishuo.share.base.login.ILoginManager;
-import com.liulishuo.share.base.login.LoginListener;
-import com.liulishuo.share.base.login.UserInfoListener;
-import com.liulishuo.share.util.HttpUtil;
-import com.sina.weibo.sdk.api.share.IWeiboShareAPI;
-import com.sina.weibo.sdk.api.share.WeiboShareSDK;
-import com.sina.weibo.sdk.auth.AuthInfo;
-import com.sina.weibo.sdk.auth.Oauth2AccessToken;
-import com.sina.weibo.sdk.auth.WeiboAuthListener;
-import com.sina.weibo.sdk.auth.sso.SsoHandler;
-import com.sina.weibo.sdk.exception.WeiboException;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-
-/**
- * Created by echo on 5/19/15.
- */
-public class WeiboLoginManager implements ILoginManager {
-
-    /**
-     * 注意：SsoHandler 仅当 SDK 支持 SSO 时有效
-     */
-    private static SsoHandler ssoHandler;
-
-    private static LoginListener loginListener;
-
-    @Override
-    public void login(@NonNull final Activity activity, @Nullable final LoginListener loginListener) {
-        WeiboLoginManager.loginListener = loginListener;
-        /**
-         * 启动activity后，应该立刻调用{@link #sendLoginMsg}方法
-         */
-        activity.startActivity(new Intent(activity, SL_WeiBoLoginActivity.class));
-    }
-
-    protected static void sendLoginMsg(final Activity activity) {
-        String appId = ShareBlock.getInstance().weiboAppId;
-        if (TextUtils.isEmpty(appId)) {
-            throw new NullPointerException("请通过shareBlock初始化weiboAppId");
-        }
-
-        AccessTokenKeeper.clear(activity);
-
-        AuthInfo authInfo = new AuthInfo(activity, appId,
-                ShareBlock.getInstance().weiboRedirectUrl,
-                ShareBlock.getInstance().weiboScope);
-
-        ssoHandler = new SsoHandler(activity, authInfo);
-        ssoHandler.authorize(new WeiboAuthListener() {
-            /*
-             * 1. SSO 授权时，需要在 onActivityResult 中调用 {@link SsoHandler#authorizeCallBack} 后，
-             * 该回调才会被执行。
-             * 2. 非SSO 授权时，当授权结束后，该回调就会被执行
-             */
-            @Override
-            public void onComplete(Bundle values) {
-                final Oauth2AccessToken accessToken = Oauth2AccessToken.parseAccessToken(values);
-                if (accessToken != null && accessToken.isSessionValid()) {
-                    AccessTokenKeeper.writeAccessToken(activity, accessToken);
-                    if (loginListener != null) {
-                        loginListener.onSuccess(accessToken.getToken(),
-                                accessToken.getUid(),
-                                accessToken.getExpiresTime() / 1000000,
-                                oAuthData2Json(accessToken));
-                    }
-                }
-            }
-
-            @Override
-            public void onWeiboException(WeiboException e) {
-                if (loginListener != null) {
-                    loginListener.onError(e.getMessage());
-                }
-            }
-
-            @Override
-            public void onCancel() {
-                if (loginListener != null) {
-                    loginListener.onCancel();
-                }
-            }
-        });
-    }
-
-    /**
-     * 解析用户登录的结果
-     * SSO 授权回调   重要：发起 SSO 登陆的 Activity 必须重写 onActivityResult
-     */
-    protected static void handlerOnActivityResult(int requestCode, int resultCode, Intent data) {
-        if (ssoHandler != null) {
-            ssoHandler.authorizeCallBack(requestCode, resultCode, data);
-        }
-    }
-
-    private static
-    @Nullable
-    String oAuthData2Json(@NonNull Oauth2AccessToken data) {
-        JSONObject jsonObject = new JSONObject();
-        try {
-            jsonObject.put("uid", data.getUid());
-            jsonObject.put("refresh_token", data.getRefreshToken());
-            jsonObject.put("access_token", data.getToken());
-            jsonObject.put("expires_in", String.valueOf(data.getExpiresTime() / 1000000));
-            return jsonObject.toString();
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    // ---------------------------------- 得到用户信息 -------------------------------------
-
-    @Override
-    public void getUserInformation(@NonNull String accessToken, @NonNull String userId, @Nullable UserInfoListener listener) {
-        getUserInfo(accessToken, userId, listener);
-    }
-
-    /**
-     * 得到微博用户的信息
-     *
-     * @see "http://open.weibo.com/wiki/2/users/show"
-     */
-    public static void getUserInfo(final @NonNull String accessToken, final @NonNull String uid,
-            @Nullable final UserInfoListener listener) {
-
-        new AsyncTask<Void, Void, AuthUserInfo>() {
-
-            @Override
-            protected AuthUserInfo doInBackground(Void... params) {
-                String respStr = HttpUtil.doGet("https://api.weibo.com/2/users/show.json"
-                        + "?access_token=" + accessToken + "&uid=" + uid);
-                if (respStr == null) {
-                    return null;
-                }
-
-                AuthUserInfo userInfo = null;
-                try {
-                    userInfo = new AuthUserInfo();
-                    JSONObject jsonObject = new JSONObject(respStr);
-                    userInfo.nickName = jsonObject.getString("screen_name");
-                    userInfo.sex = jsonObject.getString("gender");
-                    userInfo.headImgUrl = jsonObject.getString("avatar_large");
-                    userInfo.userId = jsonObject.getString("id");
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-                return userInfo;
-            }
-
-            @Override
-            protected void onPostExecute(@Nullable AuthUserInfo userInfo) {
-                super.onPostExecute(userInfo);
-                if (listener != null) {
-                    if (userInfo != null) {
-                        listener.onSuccess(userInfo);
-                    } else {
-                        listener.onError("用户信息解析异常");
-                    }
-                }
-            }
-        }.execute();
-    }
-
-    public static boolean isWeiBoInstalled(@NonNull Context context) {
-        IWeiboShareAPI shareAPI = WeiboShareSDK.createWeiboAPI(context, ShareBlock.getInstance().weiboAppId);
-        return shareAPI.isWeiboAppInstalled();
-    }
-
-}
diff --git a/share/src/main/java/com/liulishuo/share/weibo/WeiboShareManager.java b/share/src/main/java/com/liulishuo/share/weibo/WeiboShareManager.java
deleted file mode 100644
index fb6821d..0000000
--- a/share/src/main/java/com/liulishuo/share/weibo/WeiboShareManager.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package com.liulishuo.share.weibo;
-
-import com.liulishuo.share.ShareBlock;
-import com.liulishuo.share.base.Constants;
-import com.liulishuo.share.base.share.IShareManager;
-import com.liulishuo.share.base.share.ShareStateListener;
-import com.liulishuo.share.base.shareContent.ShareContent;
-import com.sina.weibo.sdk.api.ImageObject;
-import com.sina.weibo.sdk.api.MusicObject;
-import com.sina.weibo.sdk.api.TextObject;
-import com.sina.weibo.sdk.api.VideoObject;
-import com.sina.weibo.sdk.api.WebpageObject;
-import com.sina.weibo.sdk.api.WeiboMultiMessage;
-import com.sina.weibo.sdk.api.share.IWeiboShareAPI;
-import com.sina.weibo.sdk.api.share.SendMultiMessageToWeiboRequest;
-import com.sina.weibo.sdk.api.share.WeiboShareSDK;
-import com.sina.weibo.sdk.constant.WBConstants;
-import com.sina.weibo.sdk.utils.Utility;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-
-/**
- * Created by echo on 5/18/15.
- */
-public class WeiboShareManager implements IShareManager {
-
-    private static ShareStateListener shareStateListener;
-
-    private static SendMultiMessageToWeiboRequest request;
-
-    /**
-     * 启动新的activity进行分享
-     */
-    public void share(@NonNull Activity activity, @NonNull ShareContent shareContent, @ShareBlock.ShareType int shareType,
-            @Nullable ShareStateListener listener) {
-
-        shareStateListener = listener;
-        // 建立请求体
-        request = new SendMultiMessageToWeiboRequest();
-        request.transaction = buildTransaction("tag");// 用transaction唯一标识一个请求
-        request.multiMessage = getShareObject(shareContent);
-        /**
-         * 启动activity进行分享，启动后应该立刻调用{@link #sendShareMsg(Activity)}
-         */
-        activity.startActivity(new Intent(activity, SL_WeiBoShareActivity.class));
-    }
-
-    /**
-     * 在启动的activity中发送分享的信息
-     */
-    protected static void sendShareMsg(Activity activity) {
-        String appId = ShareBlock.getInstance().weiboAppId;
-        if (TextUtils.isEmpty(appId)) {
-            throw new NullPointerException("请通过shareBlock初始化weiboAppId");
-        }
-        IWeiboShareAPI api = WeiboShareSDK.createWeiboAPI(activity, appId);
-        api.registerApp();  // 将应用注册到微博客户端
-        api.sendRequest(activity, request);
-    }
-
-    /**
-     * 处理分享的回调
-     */
-    protected static void parseShareResp(int respCode, String errorMsg) {
-        if (shareStateListener != null) {
-            switch (respCode) {
-                case WBConstants.ErrorCode.ERR_OK:
-                    shareStateListener.onSuccess();
-                    break;
-
-                case WBConstants.ErrorCode.ERR_CANCEL:
-                    shareStateListener.onCancel();
-                    break;
-
-                case WBConstants.ErrorCode.ERR_FAIL:
-                    shareStateListener.onError(errorMsg);
-                    break;
-                default:
-                    shareStateListener.onError("未知错误");
-            }
-        }
-    }
-
-    // --------------------------
-
-    private WeiboMultiMessage getShareObject(@NonNull ShareContent shareContent) {
-        WeiboMultiMessage weiboMultiMessage = new WeiboMultiMessage();
-        switch (shareContent.getType()) {
-            case Constants.SHARE_TYPE_TEXT:
-                // 纯文字
-                weiboMultiMessage.textObject = getTextObj(shareContent.getSummary());
-                break;
-            case Constants.SHARE_TYPE_PIC:
-                // 纯图片
-                weiboMultiMessage.imageObject = getImageObj(shareContent);
-                break;
-            case Constants.SHARE_TYPE_WEBPAGE:
-                // 网页
-                if (shareContent.getURL() == null) {
-                    weiboMultiMessage.imageObject = getImageObj(shareContent);
-                    weiboMultiMessage.textObject = getTextObj(shareContent.getSummary());
-                } else {
-                    weiboMultiMessage.mediaObject = getWebPageObj(shareContent);
-                }
-                break;
-            case Constants.SHARE_TYPE_MUSIC:
-                // 音乐
-                weiboMultiMessage.mediaObject = getMusicObj(shareContent);
-                break;
-            default:
-                throw new UnsupportedOperationException("不支持的分享内容");
-        }
-        if (!weiboMultiMessage.checkArgs()) {
-            throw new IllegalArgumentException("分享信息的参数类型不正确");
-        }
-        return weiboMultiMessage;
-    }
-
-    /**
-     * 创建文本消息对象。
-     *
-     * @return 文本消息对象。
-     */
-    private TextObject getTextObj(String text) {
-        TextObject textObject = new TextObject();
-        textObject.text = text;
-        return textObject;
-    }
-
-    /**
-     * 创建图片消息对象。
-     *
-     * @return 图片消息对象。
-     */
-    private ImageObject getImageObj(ShareContent shareContent) {
-        byte[] bmpBytes = shareContent.getImageBmpBytes();
-        if (bmpBytes != null) {
-            ImageObject imageObject = new ImageObject();
-            imageObject.imageData = bmpBytes;
-            return imageObject;
-        }
-        return null;
-    }
-
-    /**
-     * 创建多媒体（网页）消息对象。
-     *
-     * @return 多媒体（网页）消息对象。
-     */
-    private WebpageObject getWebPageObj(ShareContent shareContent) {
-        WebpageObject mediaObject = new WebpageObject();
-        mediaObject.identify = Utility.generateGUID();
-        mediaObject.title = shareContent.getTitle();
-        mediaObject.description = shareContent.getSummary();
-        // 设置 Bitmap 类型的图片到视频对象里        
-        // 设置缩略图。 注意：最终压缩过的缩略图大小不得超过 32kb。
-        mediaObject.thumbData = shareContent.getImageBmpBytes();
-        mediaObject.actionUrl = shareContent.getURL();
-        mediaObject.defaultText = shareContent.getSummary();
-        return mediaObject;
-    }
-
-    /**
-     * 创建多媒体（音乐）消息对象。
-     *
-     * @return 多媒体（音乐）消息对象。
-     */
-    private MusicObject getMusicObj(ShareContent shareContent) {
-        // 创建媒体消息
-        MusicObject musicObject = new MusicObject();
-        musicObject.identify = Utility.generateGUID();
-        musicObject.title = shareContent.getTitle();
-        musicObject.description = shareContent.getSummary();
-        // 设置 Bitmap 类型的图片到视频对象里        
-        // 设置缩略图。 注意：最终压缩过的缩略图大小不得超过 32kb。
-        musicObject.thumbData = shareContent.getImageBmpBytes();
-        musicObject.actionUrl = shareContent.getMusicUrl();
-        musicObject.dataUrl = ShareBlock.getInstance().weiboRedirectUrl;
-        musicObject.dataHdUrl = ShareBlock.getInstance().weiboRedirectUrl;
-        musicObject.duration = 10;
-        musicObject.defaultText = shareContent.getSummary();
-        return musicObject;
-    }
-
-    /**
-     * 创建多媒体（视频）消息对象。
-     *
-     * @return 多媒体（视频）消息对象。
-     */
-    private VideoObject getVideoObj(ShareContent shareContent) {
-        VideoObject videoObject = new VideoObject();
-        videoObject.identify = Utility.generateGUID();
-        videoObject.title = shareContent.getTitle();
-        videoObject.description = shareContent.getSummary();
-        // 设置 Bitmap 类型的图片到视频对象里        
-        // 设置缩略图。 注意：最终压缩过的缩略图大小不得超过 32kb。
-        videoObject.thumbData = shareContent.getImageBmpBytes();
-        videoObject.actionUrl = shareContent.getURL();
-        videoObject.dataUrl = ShareBlock.getInstance().weiboRedirectUrl;
-        videoObject.dataHdUrl = ShareBlock.getInstance().weiboRedirectUrl;
-        videoObject.duration = 10;
-        videoObject.defaultText = shareContent.getSummary(); // 默认文案
-        return videoObject;
-    }
-
-    public static boolean isWeiBoInstalled(@NonNull Context context) {
-        IWeiboShareAPI shareAPI = WeiboShareSDK.createWeiboAPI(context, ShareBlock.getInstance().weiboAppId);
-        return shareAPI.isWeiboAppInstalled();
-    }
-
-    public static String buildTransaction(final String type) {
-        return (type == null) ? String.valueOf(System.currentTimeMillis())
-                : type + System.currentTimeMillis();
-    }
-
-}
diff --git a/share/src/main/java/com/liulishuo/share/weixin/WeiXinHandlerActivity.java b/share/src/main/java/com/liulishuo/share/weixin/WeiXinHandlerActivity.java
index 8b3c5f0..16f8bab 100644
--- a/share/src/main/java/com/liulishuo/share/weixin/WeiXinHandlerActivity.java
+++ b/share/src/main/java/com/liulishuo/share/weixin/WeiXinHandlerActivity.java
@@ -1,6 +1,8 @@
 package com.liulishuo.share.weixin;
 
 import com.liulishuo.share.ShareBlock;
+import com.liulishuo.share.ShareManager;
+import com.liulishuo.share.LoginManager;
 import com.tencent.mm.sdk.modelbase.BaseReq;
 import com.tencent.mm.sdk.modelbase.BaseResp;
 import com.tencent.mm.sdk.modelmsg.SendAuth;
@@ -24,21 +26,21 @@ public abstract class WeiXinHandlerActivity extends Activity implements IWXAPIEv
      */
     private static final int TYPE_LOGIN = 1;
 
-    private IWXAPI mIWXAPI;
+    private IWXAPI api;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mIWXAPI = WXAPIFactory.createWXAPI(this, ShareBlock.getInstance().weiXinAppId, true);
-        mIWXAPI.handleIntent(getIntent(), this);
+        api = WXAPIFactory.createWXAPI(this, ShareBlock.getInstance().weiXinAppId, true);
+        api.handleIntent(getIntent(), this);
         finish();
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        if (mIWXAPI != null) {
-            mIWXAPI.handleIntent(getIntent(), this);
+        if (api != null) {
+            api.handleIntent(getIntent(), this);
         }
         finish();
     }
@@ -52,9 +54,9 @@ public void onReq(BaseReq baseReq) {
     public void onResp(BaseResp resp) {
         if (resp != null) {
             if (resp instanceof SendAuth.Resp && resp.getType() == TYPE_LOGIN) {
-                WeiXinLoginManager.parseLoginResp(this, (SendAuth.Resp) resp);
+                WeiXinLoginManager.parseLoginResp(this, (SendAuth.Resp) resp, LoginManager.listener);
             } else {
-                WeiXinShareManager.parseShareResp(resp);
+                WeiXinShareManager.parseShareResp(resp, ShareManager.listener);
             }
         }
         finish();
diff --git a/share/src/main/java/com/liulishuo/share/weixin/WeiXinLoginManager.java b/share/src/main/java/com/liulishuo/share/weixin/WeiXinLoginManager.java
index f977af5..7a8de7f 100644
--- a/share/src/main/java/com/liulishuo/share/weixin/WeiXinLoginManager.java
+++ b/share/src/main/java/com/liulishuo/share/weixin/WeiXinLoginManager.java
@@ -1,11 +1,8 @@
 package com.liulishuo.share.weixin;
 
 
+import com.liulishuo.share.LoginManager;
 import com.liulishuo.share.ShareBlock;
-import com.liulishuo.share.base.AuthUserInfo;
-import com.liulishuo.share.base.login.ILoginManager;
-import com.liulishuo.share.base.login.LoginListener;
-import com.liulishuo.share.base.login.UserInfoListener;
 import com.liulishuo.share.util.HttpUtil;
 import com.tencent.mm.sdk.modelbase.BaseResp;
 import com.tencent.mm.sdk.modelmsg.SendAuth;
@@ -17,16 +14,13 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.os.AsyncTask;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.widget.Toast;
 
 /**
  * Created by echo on 5/19/15.
  */
-public class WeiXinLoginManager implements ILoginManager {
+public class WeiXinLoginManager {
 
     /**
      * 判断请求认证时传递的状态码和响应得到的状态码是否相等
@@ -35,63 +29,55 @@ public class WeiXinLoginManager implements ILoginManager {
 
     private static final String SCOPE = "snsapi_userinfo";
 
-    private static LoginListener mLoginListener;
+    //private static LoginRespListener mRespListener;
 
-    private static LoginRespListener mRespListener;
-
-    @Override
-    public void login(@NonNull Activity context, @Nullable LoginListener loginListener) {
-        mLoginListener = loginListener;
+    public void login(@NonNull Context context) {
         String appId = ShareBlock.getInstance().weiXinAppId;
         if (TextUtils.isEmpty(appId)) {
             throw new NullPointerException("请通过shareBlock初始化WeiXinAppId");
         }
 
         IWXAPI api = WXAPIFactory.createWXAPI(context.getApplicationContext(), appId, true);
-        if (!api.isWXAppInstalled()) {
-            Toast.makeText(context.getApplicationContext(), "请安装微信哦~", Toast.LENGTH_SHORT).show();
-            return;
-        } else {
-            api.registerApp(appId);
-        }
+        api.registerApp(appId);
 
         SendAuth.Req req = new SendAuth.Req();
         req.scope = SCOPE;
         req.state = STATE;
-        api.sendReq(req);
-        // 这里的请求的回调会在activity中收到，然后通过parseLoginResp方法解析
+        api.sendReq(req); // 这里的请求的回调会在activity中收到，然后通过parseLoginResp方法解析
     }
 
     /**
      * 解析用户登录的结果
      */
-    protected static void parseLoginResp(final Activity activity, SendAuth.Resp resp) {
+    protected static void parseLoginResp(final Activity activity, SendAuth.Resp resp, LoginManager.LoginListener loginListener) {
         // 有可能是listener传入的是null，也可能是调用静态方法前没初始化当前的类
+/*
         if (mRespListener != null) {
             mRespListener.onLoginResp(resp);
         }
-        if (mLoginListener != null) {
+*/
+        if (loginListener != null) {
             switch (resp.errCode) {
                 case BaseResp.ErrCode.ERR_OK: // 登录成功
-                    handlerLoginResp(activity, resp); // 登录成功后开始通过code换取token
+                    handlerLoginResp(activity, resp, loginListener); // 登录成功后开始通过code换取token
                     break;
                 case BaseResp.ErrCode.ERR_USER_CANCEL:
-                    mLoginListener.onCancel();
+                    loginListener.onCancel();
                     break;
                 case BaseResp.ErrCode.ERR_AUTH_DENIED:
-                    mLoginListener.onError("用户拒绝授权");
+                    loginListener.onError("用户拒绝授权");
                     break;
                 default:
-                    mLoginListener.onError("未知错误");
+                    loginListener.onError("未知错误");
             }
         }
     }
 
-    public static void setRespListener(LoginRespListener respListener) {
+    /*public static void setRespListener(LoginRespListener respListener) {
         mRespListener = respListener;
-    }
+    }*/
 
-    private static void handlerLoginResp(final Activity activity, SendAuth.Resp resp) {
+    private static void handlerLoginResp(final Activity activity, SendAuth.Resp resp, final LoginManager.LoginListener loginListener) {
         HttpUtil.doGetAsync(
                 "https://api.weixin.qq.com/sns/oauth2/access_token"
                         + "?appid=" + ShareBlock.getInstance().weiXinAppId
@@ -110,7 +96,7 @@ public void onRequestComplete(String result) {
                             activity.runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    mLoginListener.onSuccess(token, openid, expires_in, jsonObject.toString());
+                                    loginListener.onSuccess(token, openid, expires_in, jsonObject.toString());
                                 }
                             });
                         } catch (JSONException e) {
@@ -123,78 +109,16 @@ public void onError() {
                         activity.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                mLoginListener.onError("无法得到登录结果 : {netWork error}");
+                                loginListener.onError("无法得到登录结果 : {netWork error}");
                             }
                         });
                     }
                 });
     }
 
-    public interface LoginRespListener {
+   /* public interface LoginRespListener {
 
         void onLoginResp(SendAuth.Resp resp);
-    }
-
-    // ---------------------------------- 得到用户信息 -------------------------------------
-
-    /**
-     * 通过传入的参数来获得用户的信息
-     */
-    @Override
-    public void getUserInformation(@NonNull String accessToken, @NonNull String userId, @Nullable UserInfoListener listener) {
-        getUserInfo(accessToken, userId, listener);
-    }
-
-    
-    public static void getUserInfo(@NonNull final String accessToken, @NonNull final String userId,
-            @Nullable final UserInfoListener listener) {
-
-        new AsyncTask<Void, Void, AuthUserInfo>() {
-
-            @Override
-            protected AuthUserInfo doInBackground(Void... params) {
-                String respStr = HttpUtil.doGet("https://api.weixin.qq.com/sns/userinfo"
-                        + "?access_token=" + accessToken + "&openid=" + userId);
-                if (respStr == null) {
-                    return null;
-                }
-
-                AuthUserInfo userInfo = null;
-                try {
-                    JSONObject jsonObject = new JSONObject(respStr);
-                    
-                    userInfo = new AuthUserInfo();
-                    userInfo.nickName = jsonObject.getString("nickname");
-                    userInfo.sex = jsonObject.getString("sex");
-                    userInfo.headImgUrl = jsonObject.getString("headimgurl");
-                    userInfo.userId = jsonObject.getString("unionid");
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-                return userInfo;
-            }
-
-            @Override
-            protected void onPostExecute(AuthUserInfo userInfo) {
-                super.onPostExecute(userInfo);
-                if (listener != null) {
-                    if (userInfo != null) {
-                        listener.onSuccess(userInfo);
-                    } else {
-                        listener.onError("用户信息解析异常");
-                    }
-                }
-            }
-
-        }.execute();
-    }
-
-    /**
-     * @return 是否已经安装微信
-     */
-    public static boolean isWeiXinInstalled(Context context) {
-        IWXAPI api = WXAPIFactory.createWXAPI(context, ShareBlock.getInstance().weiXinAppId, true);
-        return api.isWXAppInstalled();
-    }
+    }*/
 
 }
diff --git a/share/src/main/java/com/liulishuo/share/weixin/WeiXinShareManager.java b/share/src/main/java/com/liulishuo/share/weixin/WeiXinShareManager.java
index 5839c3d..445b494 100644
--- a/share/src/main/java/com/liulishuo/share/weixin/WeiXinShareManager.java
+++ b/share/src/main/java/com/liulishuo/share/weixin/WeiXinShareManager.java
@@ -1,10 +1,10 @@
 package com.liulishuo.share.weixin;
 
 import com.liulishuo.share.ShareBlock;
-import com.liulishuo.share.base.Constants;
-import com.liulishuo.share.base.share.IShareManager;
-import com.liulishuo.share.base.share.ShareStateListener;
-import com.liulishuo.share.base.shareContent.ShareContent;
+import com.liulishuo.share.ShareManager;
+import com.liulishuo.share.model.Constants;
+import com.liulishuo.share.model.shareContent.ShareContent;
+import com.liulishuo.share.type.ShareType;
 import com.tencent.mm.sdk.modelbase.BaseResp;
 import com.tencent.mm.sdk.modelmsg.SendMessageToWX;
 import com.tencent.mm.sdk.modelmsg.WXAppExtendObject;
@@ -16,79 +16,59 @@
 import com.tencent.mm.sdk.openapi.IWXAPI;
 import com.tencent.mm.sdk.openapi.WXAPIFactory;
 
-import android.app.Activity;
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.widget.Toast;
 
 import static com.tencent.mm.sdk.modelmsg.WXMediaMessage.IMediaObject;
 
 /**
  * Created by echo on 5/18/15.
  */
-public class WeiXinShareManager implements IShareManager {
+public class WeiXinShareManager {
 
-    private static ShareStateListener mShareStateListener;
-
-    /**
-     * 进行分享
-     */
-    @Override
-    public void share(@NonNull Activity activity, @NonNull ShareContent shareContent, @ShareBlock.ShareType int shareType, 
-            @Nullable ShareStateListener listener) {
-        
-        mShareStateListener = listener;
-        sendShareMsg(activity, shareContent, shareType); 
-    }
-
-    private void sendShareMsg(@NonNull Activity activity, @NonNull ShareContent shareContent, @ShareBlock.ShareType int shareType) {
+    public void sendShareMsg(@NonNull Context context, @NonNull ShareContent shareContent,
+            ShareType shareType) {
         String weChatAppId = ShareBlock.getInstance().weiXinAppId;
         if (TextUtils.isEmpty(weChatAppId)) {
             throw new NullPointerException("请通过shareBlock初始化WeChatAppId");
         }
 
-        IWXAPI IWXAPI = WXAPIFactory.createWXAPI(activity, weChatAppId, true);
-        if (!IWXAPI.isWXAppInstalled()) {
-            Toast.makeText(activity, "请安装微信哦~", Toast.LENGTH_SHORT).show();
-        } else {
-            IWXAPI.registerApp(weChatAppId);
-        }
+        IWXAPI IWXAPI = WXAPIFactory.createWXAPI(context, weChatAppId, true);
+        IWXAPI.registerApp(weChatAppId);
 
         SendMessageToWX.Req req = getReq(shareContent, shareType);
         IWXAPI.sendReq(req);
     }
 
-
     /**
      * 解析分享到微信的结果
      */
-    protected static void parseShareResp(BaseResp resp) {
-        if (mShareStateListener != null) {
+    protected static void parseShareResp(BaseResp resp, ShareManager.ShareStateListener listener) {
+        if (listener != null) {
             switch (resp.errCode) {
                 case BaseResp.ErrCode.ERR_OK:
                     // 分享成功
-                    mShareStateListener.onSuccess();
+                    listener.onSuccess();
                     break;
                 case BaseResp.ErrCode.ERR_USER_CANCEL:
                     // 用户取消
-                    mShareStateListener.onCancel();
+                    listener.onCancel();
                     break;
                 case BaseResp.ErrCode.ERR_AUTH_DENIED:
                     // 用户拒绝授权
-                    mShareStateListener.onError("用户拒绝授权");
+                    listener.onError("用户拒绝授权");
                     break;
                 case BaseResp.ErrCode.ERR_SENT_FAILED:
                     // 发送失败
-                    mShareStateListener.onError("发送失败");
+                    listener.onError("发送失败");
                     break;
                 case BaseResp.ErrCode.ERR_COMM:
                     // 一般错误
-                    mShareStateListener.onError("一般错误");
+                    listener.onError("一般错误");
                     break;
                 default:
-                    mShareStateListener.onError("未知错误");
+                    listener.onError("未知错误");
             }
         }
     }
@@ -96,7 +76,7 @@ protected static void parseShareResp(BaseResp resp) {
     // --------------------------
 
     @NonNull
-    private SendMessageToWX.Req getReq(@NonNull ShareContent shareContent, @ShareBlock.ShareType int shareType) {
+    private SendMessageToWX.Req getReq(@NonNull ShareContent shareContent, ShareType shareType) {
         // 建立信息体
         WXMediaMessage msg = new WXMediaMessage(getShareObject(shareContent));
         msg.title = shareContent.getTitle();
@@ -107,7 +87,11 @@ private SendMessageToWX.Req getReq(@NonNull ShareContent shareContent, @ShareBlo
         SendMessageToWX.Req req = new SendMessageToWX.Req();
         req.transaction = String.valueOf(System.currentTimeMillis());
         req.message = msg;
-        req.scene = shareType;
+        if (shareType == ShareType.WEIXIN_FRIEND) {
+            req.scene = SendMessageToWX.Req.WXSceneSession;
+        } else {
+            req.scene = SendMessageToWX.Req.WXSceneTimeline;
+        }
         return req;
     }
 
@@ -152,9 +136,9 @@ private IMediaObject getImageObj(ShareContent shareContent) {
     }
 
     private IMediaObject getWebPageObj(ShareContent shareContent) {
-        WXWebpageObject webpage = new WXWebpageObject();
-        webpage.webpageUrl = shareContent.getURL();
-        return webpage;
+        WXWebpageObject webPage = new WXWebpageObject();
+        webPage.webpageUrl = shareContent.getURL();
+        return webPage;
     }
 
     private IMediaObject getMusicObj(ShareContent shareContent) {
@@ -172,14 +156,4 @@ private IMediaObject getAppObj(ShareContent shareContent) {
         return app;
     }
 
-    
-
-    /**
-     * @return 是否已经安装微信
-     */
-    public static boolean isWeiXinInstalled(Context context) {
-        IWXAPI api = WXAPIFactory.createWXAPI(context, ShareBlock.getInstance().weiXinAppId, true);
-        return api.isWXAppInstalled();
-    }
-
 }