Skip to content

修正4.4设备运行崩溃问题；优化气泡布局居中显示位置计算规则 #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uni-cstar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修正4.4设备运行崩溃问题；优化气泡布局居中显示位置计算规则 #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0c8dd0
修正气泡显示超出屏幕的平移计算规则：如果气泡设置居中显示，那么当气泡左侧超出屏幕时，修改为对齐atView的左侧显示；相反如果气泡右侧超出…
uni-cstar Dec 14, 2022
daf6feb
修正在4.4上运行crash的问题
uni-cstar Dec 19, 2022
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
1 change: 1 addition & 0 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.12.0'
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
implementation 'com.github.mmin18:realtimeblurview:1.2.1'
annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.3.1"
}
75 changes: 50 additions & 25 deletions library/src/main/java/com/lxj/xpopup/core/BubbleAttachPopupView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,22 +194,28 @@ public void run() {
public void run() {
if(popupInfo==null) return;
// translationX: 在左边就和atView左边对齐，在右边就和其右边对齐
if(popupInfo.isCenterHorizontal){
translationX = (rect.left + rect.right)/2f + defaultOffsetX - getPopupContentView().getMeasuredWidth()/2f;
}else {
if (isRTL) {
if(isShowLeft){
translationX = -(XPopupUtils.getAppWidth(getContext()) - rect.right - defaultOffsetX - bubbleContainer.getShadowRadius());
}else {
translationX = - (XPopupUtils.getAppWidth(getContext()) - rect.left + defaultOffsetX + bubbleContainer.getShadowRadius() - getPopupContentView().getMeasuredWidth());
}
boolean isCenterHorizontal = popupInfo.isCenterHorizontal;
boolean isAlignLeft = !isShowLeft;
if (isCenterHorizontal) {
float translateXLeft = (rect.left + rect.right) / 2f + defaultOffsetX - getPopupContentView().getMeasuredWidth() / 2f;
if (translateXLeft < 0) {
//左边已经超出屏幕范围，则修正为左对齐
isCenterHorizontal = false;
isAlignLeft = true;
setTranslateX(isRTL, rect, true);
} else {
if(isShowLeft){
translationX = rect.right + defaultOffsetX - getPopupContentView().getMeasuredWidth() + bubbleContainer.getShadowRadius();
}else {
translationX = rect.left + defaultOffsetX - bubbleContainer.getShadowRadius();
float translateXRight = (rect.left + rect.right) / 2f + defaultOffsetX + getPopupContentView().getMeasuredWidth() / 2f;
if (translateXRight > XPopupUtils.getAppWidth(getContext())) {
//右边超出了屏幕范围，则修正为右对齐
isCenterHorizontal = false;
isAlignLeft = false;
setTranslateX(isRTL, rect, false);
} else {
translationX = translateXLeft;
}
}
} else {
setTranslateX(isRTL, rect, isAlignLeft);
}

if (isShowUpToTarget()) {
Expand All @@ -220,23 +226,23 @@ public void run() {
}

//设置气泡相关
if(isShowUpToTarget()){
if (isShowUpToTarget()) {
bubbleContainer.setLook(BubbleLayout.Look.BOTTOM);
}else {
} else {
bubbleContainer.setLook(BubbleLayout.Look.TOP);
}
//箭头对着目标View的中心
if(popupInfo.isCenterHorizontal){
if (isCenterHorizontal) {
bubbleContainer.setLookPositionCenter(true);
}else {
if(isRTL){
if(isShowLeft){
bubbleContainer.setLookPosition(Math.max(0, (int) (-translationX - rect.width()/2 - defaultOffsetX + bubbleContainer.mLookWidth/2)));
}else {
bubbleContainer.setLookPosition(Math.max(0, (int) ( rect.width()/2 - defaultOffsetX + bubbleContainer.mLookWidth/2)));
} else {
if (isRTL) {
if (!isAlignLeft) {
bubbleContainer.setLookPosition(Math.max(0, (int) (-translationX - rect.width() / 2 - defaultOffsetX + bubbleContainer.mLookWidth / 2)));
} else {
bubbleContainer.setLookPosition(Math.max(0, (int) (rect.width() / 2 - defaultOffsetX + bubbleContainer.mLookWidth / 2)));
}
}else {
bubbleContainer.setLookPosition(Math.max(0, (int) (rect.right - rect.width()/2 - translationX - bubbleContainer.mLookWidth/2)));
} else {
bubbleContainer.setLookPosition(Math.max(0, (int) (rect.right - rect.width() / 2 - translationX - bubbleContainer.mLookWidth / 2)));
}
}
bubbleContainer.invalidate();
Expand All @@ -247,8 +253,27 @@ public void run() {
}
});
}
}


/**
* @param isRTL
* @param atViewRect
* @param isAlignLeft 汽泡是否与atView左对齐，相反则右对齐
*/
private void setTranslateX(boolean isRTL, Rect atViewRect, boolean isAlignLeft) {
if (isRTL) {
if (!isAlignLeft) {
translationX = -(XPopupUtils.getAppWidth(getContext()) - atViewRect.right - defaultOffsetX - bubbleContainer.getShadowRadius());
} else {
translationX = -(XPopupUtils.getAppWidth(getContext()) - atViewRect.left + defaultOffsetX + bubbleContainer.getShadowRadius() - getPopupContentView().getMeasuredWidth());
}
} else {
if (!isAlignLeft) {
translationX = atViewRect.right + defaultOffsetX - getPopupContentView().getMeasuredWidth() + bubbleContainer.getShadowRadius();
} else {
translationX = atViewRect.left + defaultOffsetX - bubbleContainer.getShadowRadius();
}
}
}

protected void initAndStartAnimation(){
Expand Down