[update] 微博sdk升级到4.3.8 版本，发布新版本1.0.5

Author: chendongMarch

README.md

@@ -3,7 +3,7 @@
 
 ![](http://cdn1.showjoy.com/shop/images/20180828/MLI1YQGFQLZBRO3VKH6U1535432744013.png)
 
-> 最新版本(1.0.1)   Easier 、Lighter 、 More Business-Oriented
+> 最新版本(1.0.5)   Easier 、Lighter 、 More Business-Oriented
 
 以更简单、更轻量、更加面向业务需求为设计目标，提供 **微博**、**微信**、**QQ**、**Tim**、**QQ 轻聊版**、**钉钉** 的登陆分享功能支持；
 
@@ -15,7 +15,7 @@
 
 <img  style="margin-right:20px;height:20px"  src="https://img.shields.io/circleci/project/github/badges/shields/master.svg"/>
 
-<img  style="margin-right:20px;height:20px"  src="https://img.shields.io/badge/version-1.0.1-blue.svg?maxAge=2592000"/>
+<img  style="margin-right:20px;height:20px"  src="https://img.shields.io/badge/version-1.0.5-blue.svg?maxAge=2592000"/>
 
 <img style="margin-right:20px;height:20px"  src="https://img.shields.io/github/stars/chendongMarch/SocialSdkLibrary.svg"/>
 

README_NO_PLUGIN.md

@@ -9,12 +9,12 @@
 
 ```gradle
 // 依赖核心库
-implementation "com.zfy:social-sdk-core:1.0.1"
+implementation "com.zfy:social-sdk-core:1.0.4"
 // 依赖不同的平台库
-implementation "com.zfy:social-sdk-wx:1.0.1"
-implementation "com.zfy:social-sdk-dd:1.0.0"
-implementation "com.zfy:social-sdk-qq:1.0.0"
-implementation "com.zfy:social-sdk-wb:1.0.0"
+implementation "com.zfy:social-sdk-wx:1.0.2"
+implementation "com.zfy:social-sdk-dd:1.0.2"
+implementation "com.zfy:social-sdk-qq:1.0.2"
+implementation "com.zfy:social-sdk-wb:1.0.5"
 ```
 
 在代码中初始化：

SocialPlugin/build.gradle

@@ -28,7 +28,7 @@ publish {
     userOrg = 'zfy'
     groupId = 'com.zfy.social'
     artifactId = 'social-sdk-plugin'
-    publishVersion = '1.0.3'
+    publishVersion = '1.0.5'
     desc = 'SocialSdkPlugin'
     website = 'https://github.com/chendongMarch/SocialSdkLibrary'
 }

SocialPlugin/src/main/groovy/com.zfy.social.plugin/SocialPlugin.groovy

@@ -135,10 +135,10 @@ class SocialPlugin implements Plugin<Project> {
             log "使用本地依赖，不使用远程依赖"
             return
         }
-        def coreV = version(extension.core, "1.0.3")
+        def coreV = version(extension.core, "1.0.4")
         def wxV = version(extension.wx, "1.0.2")
         def qqV = version(extension.qq, "1.0.2")
-        def wbV = version(extension.wb, "1.0.2")
+        def wbV = version(extension.wb, "1.0.5")
         def ddV = version(extension.dd, "1.0.2")
 
         def coreLib = "com.zfy:social-sdk-core:${coreV}"

SocialSdkCore/build.gradle

@@ -10,7 +10,7 @@ publish {
     userOrg = 'zfy'
     groupId = 'com.zfy'
     artifactId = 'social-sdk-core'
-    publishVersion = '1.0.3'
+    publishVersion = '1.0.4'
     desc = 'SocialSdkCore'
     website = 'https://github.com/chendongMarch/SocialSdkLibrary'
 }

SocialSdkCore/src/main/java/com/zfy/social/core/manager/LoginManager.java

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.arch.lifecycle.Lifecycle;
 import android.arch.lifecycle.LifecycleObserver;
+import android.arch.lifecycle.LifecycleOwner;
 import android.arch.lifecycle.OnLifecycleEvent;
 import android.content.Context;
 import android.content.Intent;
@@ -46,6 +47,7 @@ public static void login(Activity act, int target, OnLoginStateListener listener
      *
      * @param act      发起登录的 activity
      * @param target   目标平台
+     * @param obj 登录对象
      * @param listener 回调
      */
     public static void login(Activity act, int target, LoginObj obj, OnLoginStateListener listener) {
@@ -145,6 +147,12 @@ private void preLogin(
                 final LoginObj obj,
                 final OnLoginStateListener listener) {
 
+            if (act instanceof LifecycleOwner) {
+                Lifecycle lifecycle = ((LifecycleOwner) act).getLifecycle();
+                if (lifecycle != null) {
+                    lifecycle.addObserver(this);
+                }
+            }
             listener.onState(act, LoginResult.stateOf(Result.STATE_START));
 
             currentObj = obj;
@@ -154,7 +162,6 @@ private void preLogin(
             IPlatform platform = GlobalPlatform.newPlatformByTarget(act, target);
             GlobalPlatform.savePlatform(platform);
 
-
             if (target == Target.LOGIN_WX_SCAN) {
                 wrapListener = new OnLoginListenerWrap(stateListener);
                 GlobalPlatform.getCurrentPlatform().login(act, target, obj, wrapListener);

SocialSdkCore/src/main/java/com/zfy/social/core/manager/ShareManager.java

@@ -140,6 +140,13 @@ private void preShare(
                 final OnShareStateListener listener
         ) {
 
+            if (act instanceof LifecycleOwner) {
+                Lifecycle lifecycle = ((LifecycleOwner) act).getLifecycle();
+                if (lifecycle != null) {
+                    lifecycle.addObserver(this);
+                }
+            }
+
             listener.onState(act, ShareResult.startOf(shareTarget, currentObj));
 
             if (cts != null) {
@@ -193,6 +200,7 @@ private void preDoShare(
                 ShareObj shareObj,
                 OnShareStateListener onShareListener
         ) {
+
             stateListener = onShareListener;
             try {
                 ShareObjCheckUtil.checkShareObjParams(activity, shareTarget, shareObj);

SocialSdkCore/src/main/java/com/zfy/social/core/util/FileUtil.java

@@ -162,7 +162,7 @@ public static String mapResId2LocalPath(Context context, int resId) {
     }
 
     public static File saveWxCode2File(byte[] buffer) throws IOException {
-        File saveFile = new File(SocialSdk.opts().getCacheDir(), "code.jpg");
+        File saveFile = new File(SocialSdk.opts().getCacheDir(), System.currentTimeMillis() + "_code.jpg");
         Bitmap bitmap = BitmapFactory.decodeByteArray(buffer, 0, buffer.length);
         bitmap.compress(Bitmap.CompressFormat.JPEG, 100, new FileOutputStream(saveFile));
         BitmapUtil.recyclerBitmaps(bitmap);

SocialSdkWb/build.gradle

@@ -4,15 +4,15 @@ dependencies {
     // compileOnly libs.social_core
     compileOnly project(':SocialSdkCore')
     compileOnly libs.appcompat_v7
-    implementation 'com.sina.weibo.sdk:core:4.3.9:openDefaultRelease@aar' // 微博
+    implementation 'com.sina.weibo.sdk:core:4.3.8:openDefaultRelease@aar' // 微博
 }
 
 apply plugin: 'bintray-release'
 publish {
     userOrg = 'zfy'
     groupId = 'com.zfy'
     artifactId = 'social-sdk-weibo'
-    publishVersion = '1.0.3'
+    publishVersion = '1.0.5'
     desc = 'SocialSdkWb'
     website = 'https://github.com/chendongMarch/SocialSdkLibrary'
 }

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.zfy.social:social-sdk-plugin:1.0.3'
+        classpath 'com.zfy.social:social-sdk-plugin:1.0.5'
         classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'com.novoda:bintray-release:0.8.1'
     }