Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:7.0.3'
// classpath 'com.novoda:bintray-release:0.9.2'
}
}
Expand All @@ -23,11 +23,11 @@ task clean(type: Delete) {
}

ext {
compileSdkVersion = 29
compileSdkVersion = 30
minSdkVersion = 14
targetSdkVersion = compileSdkVersion
targetSdkVersion = 26

appCompatVersion = "1.2.0-rc01"
appCompatVersion = "1.1.0-rc01"

// userOrg = "jantxue"
// groupId = "me.xuexuan"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.os.Handler;
import android.os.Looper;
import android.os.MessageQueue;
import android.util.Log;

import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
Expand Down Expand Up @@ -97,8 +98,7 @@ public void onResume() {
public void onPause() {
//界面还没有执行到initVisible 发出的任务taskDispatchSupportVisible,界面就已经pause。
//为了让下次resume 时候,能正常的执行需要设置mAbortInitVisible ,来确保在resume的时候,可以执行完整initVisible
if (mIdleDispatchSupportVisible != null) {
Looper.myQueue().removeIdleHandler(mIdleDispatchSupportVisible);
if (checkSetVisibleHandler()){
mAbortInitVisible = true;
return;
}
Expand All @@ -120,6 +120,9 @@ public void onHiddenChanged(boolean hidden) {
return;
}
if (hidden) {
if (checkSetVisibleHandler()){
mAbortInitVisible = true;
}
dispatchSupportVisible(false);
} else {
safeDispatchUserVisibleHint(true);
Expand Down Expand Up @@ -151,21 +154,52 @@ public void onDestroyView() {
mIsOnceVisible = false;
}


// daizhipeng修改 解决viewpager快速切换导致生命周失效的问题
// 快速切换可以出现以下情况
// page在的visible逻辑在队列中还未执行,此时调用page的invisible逻辑不成功(因page还未visible)
// 此时page visible成功后,配对的invisible已经错失

public void setUserVisibleHint(boolean isVisibleToUser) {
// Log.d("sky-frg", "setUserVisibleHint1:" + isVisibleToUser);
if (mFragment.isResumed() || (!mFragment.isAdded() && isVisibleToUser)) {
if (!mCurrentVisible && isVisibleToUser) {
safeDispatchUserVisibleHint(true);
} else if (mCurrentVisible && !isVisibleToUser) {
dispatchSupportVisible(false);
// Log.d("sky-frg", "setUserVisibleHint2:" + isVisibleToUser + " mCurrentVisible:" + mCurrentVisible);

if (isVisibleToUser) {
if (!mCurrentVisible) {
// Log.d("sky-frg", "setUserVisibleHint3");
safeDispatchUserVisibleHint(true);
}
} else {
if (mCurrentVisible) {
dispatchSupportVisible(false);
} else if (checkSetVisibleHandler()){
mAbortInitVisible = true;
}

}


}
}

// daizhipeng修改 增加事件对列检测逻辑
// 当队列中有page visible handler时,删除
private boolean checkSetVisibleHandler() {
if (mIdleDispatchSupportVisible != null) {
Looper.myQueue().removeIdleHandler(mIdleDispatchSupportVisible);
mIdleDispatchSupportVisible = null;
return true;
}
return false;
}


private void safeDispatchUserVisibleHint(boolean visible) {

if (visible) {
enqueueDispatchVisible();
}else {
} else {
if (mIsOnceVisible) {
dispatchSupportVisible(false);
}
Expand All @@ -174,6 +208,8 @@ private void safeDispatchUserVisibleHint(boolean visible) {

private void enqueueDispatchVisible() {

checkSetVisibleHandler();

mIdleDispatchSupportVisible = new MessageQueue.IdleHandler() {
@Override
public boolean queueIdle() {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip