update gradle

Author: chendongMarch

UpdateLog.md

@@ -1 +0,0 @@
-2017.12.05 支持使用网络图片作为参数，内置下载功能。

build.gradle

@@ -2,15 +2,10 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 25
-    // 升级到 gradle3.0 不需要使用buildToolsVersion
-    // buildToolsVersion 25
-
+    buildToolsVersion '25.3.0'
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
-        // 占位
+        targetSdkVersion 23
         manifestPlaceholders.qq_id = "1104910200"
     }
 

src/main/java/com/march/socialsdk/SocialSdk.java

@@ -28,7 +28,6 @@ public static void init(SocialSdkConfig config) {
         sSocialSdkConfig = config;
     }
 
-
     public static IJsonAdapter getJsonAdapter() {
         if (sJsonAdapter == null) {
             throw new IllegalStateException("为了不引入其他的json解析依赖，特地将这部分放出去，必须添加一个对应的 json 解析工具，参考代码 sample/GsonJsonAdapter.java");

src/main/java/com/march/socialsdk/helper/IntentShareHelper.java

@@ -5,7 +5,7 @@
 import android.content.Intent;
 
 import com.march.socialsdk.exception.SocialException;
-import com.march.socialsdk.utils.AuthTokenKeeper;
+import com.march.socialsdk.utils.TokenStoreUtils;
 import com.march.socialsdk.utils.LogUtils;
 import com.march.socialsdk.listener.OnLoginListener;
 import com.march.socialsdk.model.LoginResult;
@@ -105,12 +105,12 @@ public void onFailure(SocialException e) {
     }
 
     public static void clearAllToken(Context context) {
-        AuthTokenKeeper.clearToken(context, Target.LOGIN_QQ);
-        AuthTokenKeeper.clearToken(context, Target.LOGIN_WX);
-        AuthTokenKeeper.clearToken(context, Target.LOGIN_WB);
+        TokenStoreUtils.clearToken(context, Target.LOGIN_QQ);
+        TokenStoreUtils.clearToken(context, Target.LOGIN_WX);
+        TokenStoreUtils.clearToken(context, Target.LOGIN_WB);
     }
 
     public static void clearToken(Context context, @Target.LoginTarget int loginTarget) {
-        AuthTokenKeeper.clearToken(context, loginTarget);
+        TokenStoreUtils.clearToken(context, loginTarget);
     }
 }

src/main/java/com/march/socialsdk/manager/LoginManager.java

@@ -4,7 +4,7 @@
 import android.content.Intent;
 
 import com.march.socialsdk.exception.SocialException;
-import com.march.socialsdk.utils.AuthTokenKeeper;
+import com.march.socialsdk.utils.TokenStoreUtils;
 import com.march.socialsdk.utils.JsonUtils;
 import com.march.socialsdk.utils.LogUtils;
 import com.march.socialsdk.listener.OnLoginListener;
@@ -52,7 +52,7 @@ void handleResultData(Intent data) {
 
     // 登录
     public void login() {
-        QQAccessToken qqToken = AuthTokenKeeper.getQQToken(activity);
+        QQAccessToken qqToken = TokenStoreUtils.getQQToken(activity);
         if (qqToken != null) {
             mTencentApi.setAccessToken(qqToken.getAccess_token(), qqToken.getExpires_in() + "");
             mTencentApi.setOpenId(qqToken.getOpenid());
@@ -76,7 +76,7 @@ public void onComplete(Object o) {
             QQAccessToken qqToken = JsonUtils.getObject(jsonResponse.toString(), QQAccessToken.class);
             LogUtils.e(TAG, "获取到 qq token = " + qqToken.toString());
             // 保存token
-            AuthTokenKeeper.saveQQToken(activity, qqToken);
+            TokenStoreUtils.saveQQToken(activity, qqToken);
 
             mTencentApi.setAccessToken(qqToken.getAccess_token(), qqToken.getExpires_in() + "");
             mTencentApi.setOpenId(qqToken.getOpenid());

src/main/java/com/march/socialsdk/platform/tencent/QQLoginHelper.java

@@ -4,7 +4,7 @@
 import android.support.annotation.NonNull;
 
 import com.march.socialsdk.exception.SocialException;
-import com.march.socialsdk.utils.AuthTokenKeeper;
+import com.march.socialsdk.utils.TokenStoreUtils;
 import com.march.socialsdk.utils.JsonUtils;
 import com.march.socialsdk.utils.LogUtils;
 import com.march.socialsdk.listener.OnLoginListener;
@@ -66,7 +66,7 @@ public void login(String secretKey, OnLoginListener loginListener) {
         this.loginListener = loginListener;
         this.secretKey = secretKey;
         // 检测本地token的机制
-        WeChatAccessToken storeToken = AuthTokenKeeper.getWxToken(context);
+        WeChatAccessToken storeToken = TokenStoreUtils.getWxToken(context);
         if (storeToken != null && storeToken.isValid()) {
             checkAccessTokenValid(storeToken);
         } else {
@@ -99,7 +99,7 @@ public void onSuccess(@NonNull WeChatAccessToken newToken) {
                 // 获取到access_token
                 if (newToken.isNoError()) {
                     LogUtils.e(TAG, "刷新token成功 token = " + newToken);
-                    AuthTokenKeeper.saveWxToken(context, newToken);
+                    TokenStoreUtils.saveWxToken(context, newToken);
                     // 刷新完成，获取用户信息
                     getUserInfoByValidToken(token);
                 } else {
@@ -128,7 +128,7 @@ public void getAccessTokenByCode(String code) {
             public void onSuccess(@NonNull WeChatAccessToken token) {
                 // 获取到access_token
                 if (token.isNoError()) {
-                    AuthTokenKeeper.saveWxToken(context, token);
+                    TokenStoreUtils.saveWxToken(context, token);
                     getUserInfoByValidToken(token);
                 } else {
                     SocialException exception = new SocialException("获取access_token失败 code = " + token.getErrcode() + "  msg = " + token.getErrmsg());

src/main/java/com/march/socialsdk/platform/wechat/WxLoginHelper.java

@@ -5,7 +5,7 @@
 import android.os.Bundle;
 
 import com.march.socialsdk.exception.SocialException;
-import com.march.socialsdk.utils.AuthTokenKeeper;
+import com.march.socialsdk.utils.TokenStoreUtils;
 import com.march.socialsdk.utils.LogUtils;
 import com.sina.weibo.sdk.auth.Oauth2AccessToken;
 import com.sina.weibo.sdk.auth.WeiboAuthListener;
@@ -32,7 +32,7 @@ public interface OnAuthOverListener {
     }
 
     public static void auth(Activity activity, SsoHandler mSsoHandler, OnAuthOverListener listener) {
-        Oauth2AccessToken token = AuthTokenKeeper.getWbToken(activity);
+        Oauth2AccessToken token = TokenStoreUtils.getWbToken(activity);
         if (token != null && token.isSessionValid()) {
             listener.onAuth(token);
         } else {
@@ -66,7 +66,7 @@ public void onComplete(Bundle values) {
             //String phoneNum = mAccessToken.getPhoneNum();
             if (mAccessToken.isSessionValid()) {
                 // 授权成功
-                AuthTokenKeeper.saveWbToken(context, mAccessToken);
+                TokenStoreUtils.saveWbToken(context, mAccessToken);
                 listener.onAuth(mAccessToken);
             } else {
                 // 以下几种情况，您会收到 Code：

src/main/java/com/march/socialsdk/platform/weibo/WbAuthHelper.java

@@ -17,13 +17,13 @@
  * @author chendong
  */
 
-public class AuthTokenKeeper {
+public class TokenStoreUtils {
 
-    public static final String TOKEN_STORE = "TOKEN_STORE";
+    private static final String TOKEN_STORE = "TOKEN_STORE";
 
-    public static final String WECHAT_TOKEN_KEY = "WECHAT_TOKEN_KEY";
-    public static final String SINA_TOKEN_KEY   = "SINA_TOKEN_KEY";
-    public static final String QQ_TOKEN_KEY     = "QQ_TOKEN_KEY";
+    private static final String WECHAT_TOKEN_KEY = "WECHAT_TOKEN_KEY";
+    private static final String SINA_TOKEN_KEY   = "SINA_TOKEN_KEY";
+    private static final String QQ_TOKEN_KEY     = "QQ_TOKEN_KEY";
 
     private static SharedPreferences getSp(Context context) {
         return context.getSharedPreferences(TOKEN_STORE + context.getString(R.string.app_name), Context.MODE_PRIVATE);